From 6f991b91f2194038688d7cc3400cea27970821b0 Mon Sep 17 00:00:00 2001 From: Andy McCrae Date: Mon, 6 Nov 2017 12:07:27 +0000 Subject: [PATCH] Fix cinder_backup for horizon dashboard and heat We specify the "horizon_enable_cinder_backup" and the "heat_cinder_backups_enabled" settings to be the value of "cinder_service_backup_program_enabled" if defined. However that variable is never exposed to the horizon or heat group_vars, so it will always be undefined, and the feature will never be enabled for heat or horizon. We should set these to the variable on localhost, which is how we specify it for tempest and cinder, since that variable exists as a host_var it will always exist. Change-Id: Ibf2a32e03733185fa4bfe9274c65050e12317e6b --- group_vars/heat_all.yml | 2 +- group_vars/horizon_all.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/group_vars/heat_all.yml b/group_vars/heat_all.yml index cdf29e98a6..ac91793429 100644 --- a/group_vars/heat_all.yml +++ b/group_vars/heat_all.yml @@ -41,7 +41,7 @@ heat_package_state: "{{ package_state }}" # Only enable the heat cinder backups functionality if the cinder backup # service is enabled. -heat_cinder_backups_enabled: "{{ (cinder_service_backup_program_enabled is defined and cinder_service_backup_program_enabled | bool) | ternary(True, False) }}" +heat_cinder_backups_enabled: "{{ hostvars['localhost']['cinder_service_backup_program_enabled'] }}" # venv fetch configuration heat_venv_tag: "{{ venv_tag }}" diff --git a/group_vars/horizon_all.yml b/group_vars/horizon_all.yml index c984c74042..5eda3dc0eb 100644 --- a/group_vars/horizon_all.yml +++ b/group_vars/horizon_all.yml @@ -15,7 +15,7 @@ horizon_external_ssl: "{{ openstack_external_ssl }}" horizon_service_region: "{{ service_region }}" -horizon_enable_cinder_backup: "{{ cinder_service_backup_program_enabled is defined and cinder_service_backup_program_enabled | bool }}" +horizon_enable_cinder_backup: "{{ hostvars['localhost']['cinder_service_backup_program_enabled'] }}" horizon_enable_ironic_ui: "{{ (groups['ironic_all'] is defined) and (groups['ironic_all'] | length > 0) }}" horizon_enable_magnum_ui: "{{ (groups['magnum_all'] is defined) and (groups['magnum_all'] | length > 0) }}" horizon_enable_designate_ui: "{{ (groups['designate_all'] is defined) and (groups['designate_all'] | length > 0) }}"