Fix cinder-backup config issue for queens release
Closes-Bug: https://mirantis.jira.com/browse/PROD-25487
Change-Id: Id4aad7f2e577409f3cf3510b0722aa2c957a2dfd
Signed-off-by: cdodda <cdodda@mirantis.com>
diff --git a/cinder/files/backup_backend/_ceph.conf b/cinder/files/backup_backend/_ceph.conf
index ff62cb5..ba8c573 100644
--- a/cinder/files/backup_backend/_ceph.conf
+++ b/cinder/files/backup_backend/_ceph.conf
@@ -1,3 +1,4 @@
+
#backup conf
backup_driver=cinder.backup.drivers.{{ controller.backup.engine }}
backup_ceph_conf={{ controller.backup.get('ceph_conf', '/etc/ceph/ceph.conf') }}
diff --git a/cinder/files/queens/cinder.conf.controller.Debian b/cinder/files/queens/cinder.conf.controller.Debian
index 347bc2f..d72efc1 100644
--- a/cinder/files/queens/cinder.conf.controller.Debian
+++ b/cinder/files/queens/cinder.conf.controller.Debian
@@ -80,6 +80,11 @@
# Ceph configuration file to use. (string value)
#backup_ceph_conf = /etc/ceph/ceph.conf
+{%- if controller.backup.engine != None %}
+{%- set backup_backend_fragment = "cinder/files/backup_backend/_" + controller.backup.engine + ".conf" %}
+{%- include backup_backend_fragment %}
+{%- endif %}
+
# The Ceph user to connect with. Default here is to use the same user as for
# Cinder volumes. If not using cephx this should be set to None. (string value)
@@ -1066,10 +1071,6 @@
[backend_defaults]
-{%- if controller.backup.engine != None %}
-{%- set backup_backend_fragment = "cinder/files/backup_backend/_" + controller.backup.engine + ".conf" %}
-{%- include backup_backend_fragment %}
-{%- endif %}
{%- if controller.nas_secure_file_permissions is defined %}
nas_secure_file_permissions={{ controller.nas_secure_file_permissions }}
{%- endif %}