From 870836bb19189ae8743b46a37339b9f9eb27e7fe Mon Sep 17 00:00:00 2001
From: caoyuan <cao.yuan@99cloud.net>
Date: Fri, 31 Mar 2017 09:28:00 +0800
Subject: [PATCH] Enable zun ui when zun enabled
Depends-On: Ie0e02253bd706cad6a568e1574aa4c4bd83744e5
Change-Id: I10e64ea5a104109a7ced3712b29b3b526c55f7f1
Closes-Bug: #1677922
---
ansible/group_vars/all.yml | 1 +
ansible/roles/horizon/defaults/main.yml | 1 +
etc/kolla/globals.yml | 1 +
3 files changed, 3 insertions(+)
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index cd12cec83f..fe199238a6 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -350,6 +350,7 @@ enable_horizon_solum: "{{ enable_solum | bool }}"
enable_horizon_tacker: "{{ enable_tacker | bool }}"
enable_horizon_trove: "{{ enable_trove | bool }}"
enable_horizon_watcher: "{{ enable_watcher | bool }}"
+enable_horizon_zun: "{{ enable_zun | bool }}"
enable_hyperv: "no"
enable_influxdb: "no"
enable_ironic: "no"
diff --git a/ansible/roles/horizon/defaults/main.yml b/ansible/roles/horizon/defaults/main.yml
index ed12ef204a..206913b2ef 100644
--- a/ansible/roles/horizon/defaults/main.yml
+++ b/ansible/roles/horizon/defaults/main.yml
@@ -24,6 +24,7 @@ horizon_services:
ENABLE_TACKER: "{{ 'yes' if enable_horizon_tacker | bool else 'no' }}"
ENABLE_TROVE: "{{ 'yes' if enable_horizon_trove | bool else 'no' }}"
ENABLE_WATCHER: "{{ 'yes' if enable_horizon_watcher | bool else 'no' }}"
+ ENABLE_ZUN: "{{ 'yes' if enable_horizon_zun | bool else 'no' }}"
volumes:
- "{{ node_config_directory }}/horizon/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index 0e71b350c8..7d750ad7af 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -158,6 +158,7 @@ kolla_internal_vip_address: "10.10.10.254"
#enable_horizon_tacker: "{{ enable_tacker | bool }}"
#enable_horizon_trove: "{{ enable_trove | bool }}"
#enable_horizon_watcher: "{{ enable_watcher | bool }}"
+#enable_horizon_zun: "{{ enable_zun | bool }}"
#enable_hyperv: "no"
#enable_influxdb: "no"
#enable_ironic: "no"