From 2eebf64275e0fbc064f1d922931c306f4d064332 Mon Sep 17 00:00:00 2001 From: Hamed Bahadorzadeh Date: Sat, 28 Dec 2019 09:06:46 +0330 Subject: [PATCH] Adds monasca-ui to horizon Variable added to evaluate "ENABLE_MONASCA" env for 'kolla/horizon'. In case 'enable_horizon_monasca' is true, 'policy_item' would be called for Monasca. Change-Id: Ie9ecb8ab5d4e74af9b83a5b00ccced5b630ab1ed Implements: blueprint monasca-ui Signed-off-by: Hamed Bahadorzadeh --- ansible/group_vars/all.yml | 1 + ansible/roles/horizon/defaults/main.yml | 1 + ansible/roles/horizon/tasks/config.yml | 1 + etc/kolla/globals.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 20673f14e1..c0f78ec898 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -584,6 +584,7 @@ enable_horizon_magnum: "{{ enable_magnum | bool }}" enable_horizon_manila: "{{ enable_manila | bool }}" enable_horizon_masakari: "{{ enable_masakari | bool }}" enable_horizon_mistral: "{{ enable_mistral | bool }}" +enable_horizon_monasca: "{{ enable_monasca | bool }}" enable_horizon_murano: "{{ enable_murano | bool }}" enable_horizon_neutron_vpnaas: "{{ enable_neutron_vpnaas | bool }}" enable_horizon_octavia: "{{ enable_octavia | bool }}" diff --git a/ansible/roles/horizon/defaults/main.yml b/ansible/roles/horizon/defaults/main.yml index 811ee93f64..ab00feeb33 100644 --- a/ansible/roles/horizon/defaults/main.yml +++ b/ansible/roles/horizon/defaults/main.yml @@ -21,6 +21,7 @@ horizon_services: ENABLE_MANILA: "{{ 'yes' if enable_horizon_manila | bool else 'no' }}" ENABLE_MASAKARI: "{{ 'yes' if enable_horizon_masakari | bool else 'no' }}" ENABLE_MISTRAL: "{{ 'yes' if enable_horizon_mistral | bool else 'no' }}" + ENABLE_MONASCA: "{{ 'yes' if enable_horizon_monasca | bool else 'no' }}" ENABLE_MURANO: "{{ 'yes' if enable_horizon_murano | bool else 'no' }}" ENABLE_NEUTRON_VPNAAS: "{{ 'yes' if enable_horizon_neutron_vpnaas | bool else 'no' }}" ENABLE_OCTAVIA: "{{ 'yes' if enable_horizon_octavia | bool else 'no' }}" diff --git a/ansible/roles/horizon/tasks/config.yml b/ansible/roles/horizon/tasks/config.yml index 08baf4d13b..4030a8fb7d 100644 --- a/ansible/roles/horizon/tasks/config.yml +++ b/ansible/roles/horizon/tasks/config.yml @@ -35,6 +35,7 @@ - { name: "manila", enabled: "{{ enable_horizon_manila }}" } - { name: "masakari", enabled: "{{ enable_horizon_masakari }}" } - { name: "mistral", enabled: "{{ enable_horizon_mistral }}" } + - { name: "monasca", enabled: "{{ enable_horizon_monasca }}" } - { name: "murano", enabled: "{{ enable_horizon_murano }}" } - { name: "neutron", enabled: "{{ enable_neutron_horizon_policy_file }}" } - { name: "nova", enabled: "{{ enable_nova_horizon_policy_file }}" } diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 2885061c44..be24e32bc1 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -263,6 +263,7 @@ #enable_horizon_manila: "{{ enable_manila | bool }}" #enable_horizon_masakari: "{{ enable_masakari | bool }}" #enable_horizon_mistral: "{{ enable_mistral | bool }}" +#enable_horizon_monasca: "{{ enable_monasca | bool }}" #enable_horizon_murano: "{{ enable_murano | bool }}" #enable_horizon_neutron_vpnaas: "{{ enable_neutron_vpnaas | bool }}" #enable_horizon_octavia: "{{ enable_octavia | bool }}"