Merge "Fix cinder_backup for horizon dashboard and heat"

This commit is contained in:
Zuul 2017-11-15 14:47:43 +00:00 committed by Gerrit Code Review
commit 60c19524da
2 changed files with 2 additions and 2 deletions

View File

@ -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 }}"

View File

@ -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) }}"