From 2c241b9c1526994448710e59c8f2b7562600059f Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Wed, 21 Dec 2016 16:12:25 +0800 Subject: [PATCH] Add enable_horizon_* parameter for dashboard We can enable the service without enable the dashboard in this way. Change-Id: I97b9281c7f6976b75b19c49222faee3ae2a0db66 --- ansible/group_vars/all.yml | 12 ++++++++++++ ansible/roles/horizon/tasks/start.yml | 24 ++++++++++++------------ etc/kolla/globals.yml | 12 ++++++++++++ 3 files changed, 36 insertions(+), 12 deletions(-) diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index ab5a6e9c97..27a911e6bb 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -282,6 +282,18 @@ enable_gnocchi: "no" enable_grafana: "no" enable_heat: "yes" enable_horizon: "yes" +enable_horizon_cloudkitty: "{{ enable_cloudkitty | bool }}" +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_neutron_lbaas: "{{ enable_neutron_lbaas | bool }}" +enable_horizon_sahara: "{{ enable_sahara | bool }}" +enable_horizon_searchlight: "{{ enable_searchlight | bool }}" +enable_horizon_senlin: "{{ enable_senlin | bool }}" +enable_horizon_solum: "{{ enable_solum | bool }}" +enable_horizon_trove: "{{ enable_trove | bool }}" +enable_horizon_watcher: "{{ enable_watcher | bool }}" enable_influxdb: "no" enable_ironic: "no" enable_iscsid: "{{ enable_cinder_backend_iscsi | bool or enable_cinder_backend_lvm | bool or enable_ironic | bool }}" diff --git a/ansible/roles/horizon/tasks/start.yml b/ansible/roles/horizon/tasks/start.yml index 845b4e8c4d..0b44791ad5 100644 --- a/ansible/roles/horizon/tasks/start.yml +++ b/ansible/roles/horizon/tasks/start.yml @@ -6,18 +6,18 @@ image: "{{ horizon_image_full }}" name: "horizon" environment: - ENABLE_CLOUDKITTY: "{{ 'yes' if enable_cloudkitty | bool else 'no' }}" - ENABLE_IRONIC: "{{ 'yes' if enable_ironic | bool else 'no' }}" - ENABLE_MANILA: "{{ 'yes' if enable_manila | bool else 'no' }}" - ENABLE_MISTRAL: "{{ 'yes' if enable_mistral | bool else 'no' }}" - ENABLE_NEUTRON_LBAAS: "{{ 'yes' if enable_neutron_lbaas | bool else 'no' }}" - ENABLE_MAGNUM: "{{ 'yes' if enable_magnum | bool else 'no' }}" - ENABLE_SAHARA: "{{ 'yes' if enable_sahara | bool else 'no' }}" - ENABLE_SEARCHLIGHT: "{{ 'yes' if enable_searchlight | bool else 'no' }}" - ENABLE_SENLIN: "{{ 'yes' if enable_senlin | bool else 'no' }}" - ENABLE_SOLUM: "{{ 'yes' if enable_solum | bool else 'no' }}" - ENABLE_TROVE: "{{ 'yes' if enable_trove | bool else 'no' }}" - ENABLE_WATCHER: "{{ 'yes' if enable_watcher | bool else 'no' }}" + ENABLE_CLOUDKITTY: "{{ 'yes' if enable_horizon_cloudkitty | bool else 'no' }}" + ENABLE_IRONIC: "{{ 'yes' if enable_horizon_ironic | bool else 'no' }}" + 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_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' }}" + ENABLE_SENLIN: "{{ 'yes' if enable_horizon_senlin | bool else 'no' }}" + ENABLE_SOLUM: "{{ 'yes' if enable_horizon_solum | bool else 'no' }}" + ENABLE_TROVE: "{{ 'yes' if enable_horizon_trove | bool else 'no' }}" + ENABLE_WATCHER: "{{ 'yes' if enable_horizon_watcher | 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 fabdaba4ae..472c950c77 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -136,6 +136,18 @@ kolla_internal_vip_address: "10.10.10.254" #enable_grafana: "no" #enable_heat: "yes" #enable_horizon: "yes" +#enable_horizon_cloudkitty: "{{ enable_cloudkitty | bool }}" +#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_neutron_lbaas: "{{ enable_neutron_lbaas | bool }}" +#enable_horizon_sahara: "{{ enable_sahara | bool }}" +#enable_horizon_searchlight: "{{ enable_searchlight | bool }}" +#enable_horizon_senlin: "{{ enable_senlin | bool }}" +#enable_horizon_solum: "{{ enable_solum | bool }}" +#enable_horizon_trove: "{{ enable_trove | bool }}" +#enable_horizon_watcher: "{{ enable_watcher | bool }}" #enable_influxdb: "no" #enable_ironic: "no" #enable_kuryr: "no"