From e7ce7cec51b9cce882ea3ee706efaf27f3b05140 Mon Sep 17 00:00:00 2001 From: Miguel Grinberg Date: Wed, 14 Oct 2015 17:56:45 -0700 Subject: [PATCH] Add horizon setting for cinder backup This change makes the cinder backup enable flag in the Horizon configuration a variable. It also enables this flag automatically through group_vars when cinder_service_backup_program_enabled = True. Change-Id: Ib64532bbd7a3774f16766de0d3d221579aecc9ff Closes-Bug: #1504279 --- defaults/main.yml | 1 + templates/horizon_local_settings.py.j2 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 65fe32bc..32e4e20b 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -71,6 +71,7 @@ horizon_disable_password_reveal: False horizon_enable_password_retrieve: False # If nova_libvirt_inject_password is set to True, then this can also be enabled: horizon_can_set_password: False +horizon_enable_cinder_backup: False ## Horizon SSL diff --git a/templates/horizon_local_settings.py.j2 b/templates/horizon_local_settings.py.j2 index 046f954f..2df69edc 100644 --- a/templates/horizon_local_settings.py.j2 +++ b/templates/horizon_local_settings.py.j2 @@ -246,7 +246,7 @@ OPENSTACK_HYPERVISOR_FEATURES = { # The OPENSTACK_CINDER_FEATURES settings can be used to enable optional # services provided by cinder that is not exposed by its extension API. OPENSTACK_CINDER_FEATURES = { - 'enable_backup': False, + 'enable_backup': {{ horizon_enable_cinder_backup | bool }}, } # The OPENSTACK_NEUTRON_NETWORK settings can be used to enable optional