From f3ea03d88f3adce4e28c0394e48418251df026b2 Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Sat, 5 Nov 2016 02:28:02 +0800 Subject: [PATCH] Load murano dashboard dynamic * Add ENABLE_MURANO environment in horizon * Add murano related setting in local_settings.j2 file Change-Id: I172b6d07536210623b2e2066ba4f1cc768479e33 Closes-Bug: #1640679 --- ansible/group_vars/all.yml | 1 + ansible/roles/horizon/tasks/start.yml | 1 + ansible/roles/horizon/templates/local_settings.j2 | 2 +- etc/kolla/globals.yml | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 54b6268661..42d787807c 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -289,6 +289,7 @@ enable_horizon_ironic: "{{ enable_ironic | bool }}" enable_horizon_magnum: "{{ enable_magnum | bool }}" enable_horizon_manila: "{{ enable_manila | bool }}" enable_horizon_mistral: "{{ enable_mistral | bool }}" +enable_horizon_murano: "{{ enable_murano | bool }}" enable_horizon_neutron_lbaas: "{{ enable_neutron_lbaas | bool }}" enable_horizon_sahara: "{{ enable_sahara | bool }}" enable_horizon_searchlight: "{{ enable_searchlight | bool }}" diff --git a/ansible/roles/horizon/tasks/start.yml b/ansible/roles/horizon/tasks/start.yml index 0b44791ad5..19ce7d3a69 100644 --- a/ansible/roles/horizon/tasks/start.yml +++ b/ansible/roles/horizon/tasks/start.yml @@ -11,6 +11,7 @@ ENABLE_MAGNUM: "{{ 'yes' if enable_horizon_magnum | bool else 'no' }}" ENABLE_MANILA: "{{ 'yes' if enable_horizon_manila | bool else 'no' }}" ENABLE_MISTRAL: "{{ 'yes' if enable_horizon_mistral | bool else 'no' }}" + ENABLE_MURANO: "{{ 'yes' if enable_horizon_murano | bool else 'no' }}" ENABLE_NEUTRON_LBAAS: "{{ 'yes' if enable_horizon_neutron_lbaas | bool else 'no' }}" ENABLE_SAHARA: "{{ 'yes' if enable_horizon_sahara | bool else 'no' }}" ENABLE_SEARCHLIGHT: "{{ 'yes' if enable_horizon_searchlight | bool else 'no' }}" diff --git a/ansible/roles/horizon/templates/local_settings.j2 b/ansible/roles/horizon/templates/local_settings.j2 index a115655384..5965585269 100644 --- a/ansible/roles/horizon/templates/local_settings.j2 +++ b/ansible/roles/horizon/templates/local_settings.j2 @@ -455,7 +455,7 @@ TIME_ZONE = "UTC" # target installation. # Path to directory containing policy.json files -POLICY_FILES_PATH = '/etc/openstack-dashboard' +#POLICY_FILES_PATH = '/etc/openstack-dashboard' # Map of local copy of service policy files. # Please insure that your identity policy file matches the one being used on diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index fb6c1d7f95..36dc3836a9 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -141,6 +141,7 @@ kolla_internal_vip_address: "10.10.10.254" #enable_horizon_magnum: "{{ enable_magnum | bool }}" #enable_horizon_manila: "{{ enable_manila | bool }}" #enable_horizon_mistral: "{{ enable_mistral | bool }}" +#enable_horizon_murano: "{{ enable_murano | bool }}" #enable_horizon_neutron_lbaas: "{{ enable_neutron_lbaas | bool }}" #enable_horizon_sahara: "{{ enable_sahara | bool }}" #enable_horizon_searchlight: "{{ enable_searchlight | bool }}"