Fixing role for backup_backend fragment
Because of the fact that role of the node in template _ceph.conf
for backup backend is defined in controller therefore rendering of
configuration file fails if the volume had been defined separately
from controller node.
Change-Id: Ia2ba9b2fe231a8ac019da44750eefec8b81e75fd
Related-PROD: PROD-27427
diff --git a/cinder/files/backup_backend/_ceph.conf b/cinder/files/backup_backend/_ceph.conf
index ba8c573..9e9444c 100644
--- a/cinder/files/backup_backend/_ceph.conf
+++ b/cinder/files/backup_backend/_ceph.conf
@@ -1,9 +1,9 @@
#backup conf
-backup_driver=cinder.backup.drivers.{{ controller.backup.engine }}
-backup_ceph_conf={{ controller.backup.get('ceph_conf', '/etc/ceph/ceph.conf') }}
-backup_ceph_user = {{ controller.backup.get('ceph_user', 'cinder') }}
-backup_ceph_chunk_size = {{ controller.backup.get('ceph_chunk_size', 134217728 )}}
-backup_ceph_pool = {{ controller.backup.get('ceph_pool', 'backup') }}
-backup_ceph_stripe_unit = {{ controller.backup.get('ceph_stripe_unit', 0) }}
-backup_ceph_stripe_count = {{ controller.backup.get('ceph_stripe_count', 0) }}
+backup_driver=cinder.backup.drivers.{{ _data.backup.engine }}
+backup_ceph_conf={{ _data.backup.get('ceph_conf', '/etc/ceph/ceph.conf') }}
+backup_ceph_user = {{ _data.backup.get('ceph_user', 'cinder') }}
+backup_ceph_chunk_size = {{ _data.backup.get('ceph_chunk_size', 134217728 )}}
+backup_ceph_pool = {{ _data.backup.get('ceph_pool', 'backup') }}
+backup_ceph_stripe_unit = {{ _data.backup.get('ceph_stripe_unit', 0) }}
+backup_ceph_stripe_count = {{ _data.backup.get('ceph_stripe_count', 0) }}
diff --git a/cinder/files/mitaka/cinder.conf.controller.Debian b/cinder/files/mitaka/cinder.conf.controller.Debian
index 98eeeca..c270fd1 100644
--- a/cinder/files/mitaka/cinder.conf.controller.Debian
+++ b/cinder/files/mitaka/cinder.conf.controller.Debian
@@ -99,6 +99,7 @@
{%- endif %}
{%- if controller.backup.engine != None %}
+{%- set _data = controller %}
{%- set backup_backend_fragment = "cinder/files/backup_backend/_" + controller.backup.engine + ".conf" %}
{%- include backup_backend_fragment %}
{%- endif %}
diff --git a/cinder/files/mitaka/cinder.conf.volume.Debian b/cinder/files/mitaka/cinder.conf.volume.Debian
index fcb2e64..72ffa70 100644
--- a/cinder/files/mitaka/cinder.conf.volume.Debian
+++ b/cinder/files/mitaka/cinder.conf.volume.Debian
@@ -80,6 +80,7 @@
verbose=True
{%- if volume.backup.engine != None %}
+{%- set _data = volume %}
{%- set backup_backend_fragment = "cinder/files/backup_backend/_" + volume.backup.engine + ".conf" %}
{%- include backup_backend_fragment %}
{%- endif %}
diff --git a/cinder/files/newton/cinder.conf.controller.Debian b/cinder/files/newton/cinder.conf.controller.Debian
index 8c0a537..fdba747 100644
--- a/cinder/files/newton/cinder.conf.controller.Debian
+++ b/cinder/files/newton/cinder.conf.controller.Debian
@@ -114,6 +114,7 @@
{%- endif %}
{%- if controller.backup.engine != None %}
+{%- set _data = controller %}
{%- set backup_backend_fragment = "cinder/files/backup_backend/_" + controller.backup.engine + ".conf" %}
{%- include backup_backend_fragment %}
{%- endif %}
diff --git a/cinder/files/newton/cinder.conf.volume.Debian b/cinder/files/newton/cinder.conf.volume.Debian
index 373b464..b21e7d6 100644
--- a/cinder/files/newton/cinder.conf.volume.Debian
+++ b/cinder/files/newton/cinder.conf.volume.Debian
@@ -100,6 +100,7 @@
{%- endif %}
{%- if volume.backup.engine != None %}
+{%- set _data = volume %}
{%- set backup_backend_fragment = "cinder/files/backup_backend/_" + volume.backup.engine + ".conf" %}
{%- include backup_backend_fragment %}
{%- endif %}
diff --git a/cinder/files/ocata/cinder.conf.controller.Debian b/cinder/files/ocata/cinder.conf.controller.Debian
index 8e44564..39d4ed5 100644
--- a/cinder/files/ocata/cinder.conf.controller.Debian
+++ b/cinder/files/ocata/cinder.conf.controller.Debian
@@ -118,6 +118,7 @@
{%- endif %}
{%- if controller.backup.engine != None %}
+{%- set _data = controller %}
{%- set backup_backend_fragment = "cinder/files/backup_backend/_" + controller.backup.engine + ".conf" %}
{%- include backup_backend_fragment %}
{%- endif %}
diff --git a/cinder/files/ocata/cinder.conf.volume.Debian b/cinder/files/ocata/cinder.conf.volume.Debian
index a52c22a..12d8978 100644
--- a/cinder/files/ocata/cinder.conf.volume.Debian
+++ b/cinder/files/ocata/cinder.conf.volume.Debian
@@ -104,6 +104,7 @@
{%- endif %}
{%- if volume.backup.engine != None %}
+{%- set _data = volume %}
{%- set backup_backend_fragment = "cinder/files/backup_backend/_" + volume.backup.engine + ".conf" %}
{%- include backup_backend_fragment %}
{%- endif %}
diff --git a/cinder/files/pike/cinder.conf.controller.Debian b/cinder/files/pike/cinder.conf.controller.Debian
index 7a1d2f4..4689c61 100644
--- a/cinder/files/pike/cinder.conf.controller.Debian
+++ b/cinder/files/pike/cinder.conf.controller.Debian
@@ -130,6 +130,7 @@
{%- endif %}
{%- if controller.backup.engine != None %}
+{%- set _data = controller %}
{%- set backup_backend_fragment = "cinder/files/backup_backend/_" + controller.backup.engine + ".conf" %}
{%- include backup_backend_fragment %}
{%- endif %}
diff --git a/cinder/files/pike/cinder.conf.volume.Debian b/cinder/files/pike/cinder.conf.volume.Debian
index 48c138a..6f737fb 100644
--- a/cinder/files/pike/cinder.conf.volume.Debian
+++ b/cinder/files/pike/cinder.conf.volume.Debian
@@ -115,6 +115,7 @@
{%- endif %}
{%- if volume.backup.engine != None %}
+{%- set _data = volume %}
{%- set backup_backend_fragment = "cinder/files/backup_backend/_" + volume.backup.engine + ".conf" %}
{%- include backup_backend_fragment %}
{%- endif %}
diff --git a/cinder/files/queens/cinder.conf.controller.Debian b/cinder/files/queens/cinder.conf.controller.Debian
index 7c04364..54b8a04 100644
--- a/cinder/files/queens/cinder.conf.controller.Debian
+++ b/cinder/files/queens/cinder.conf.controller.Debian
@@ -81,6 +81,7 @@
# Ceph configuration file to use. (string value)
#backup_ceph_conf = /etc/ceph/ceph.conf
{%- if controller.backup.engine != None %}
+{%- set _data = controller %}
{%- set backup_backend_fragment = "cinder/files/backup_backend/_" + controller.backup.engine + ".conf" %}
{%- include backup_backend_fragment %}
{%- endif %}
diff --git a/cinder/files/queens/cinder.conf.volume.Debian b/cinder/files/queens/cinder.conf.volume.Debian
index d1b51a8..6989cce 100644
--- a/cinder/files/queens/cinder.conf.volume.Debian
+++ b/cinder/files/queens/cinder.conf.volume.Debian
@@ -1073,6 +1073,7 @@
[backend_defaults]
{%- if volume.backup.engine != None %}
+{%- set _data = volume %}
{%- set backup_backend_fragment = "cinder/files/backup_backend/_" + volume.backup.engine + ".conf" %}
{%- include backup_backend_fragment %}
{%- endif %}
diff --git a/cinder/files/rocky/cinder.conf.controller.Debian b/cinder/files/rocky/cinder.conf.controller.Debian
index f7555ba..bb2cb2c 100644
--- a/cinder/files/rocky/cinder.conf.controller.Debian
+++ b/cinder/files/rocky/cinder.conf.controller.Debian
@@ -64,6 +64,7 @@
# Ceph configuration file to use. (string value)
#backup_ceph_conf = /etc/ceph/ceph.conf
{%- if controller.backup.engine is not none %}
+{%- set _data = controller %}
{%- set backup_backend_fragment = 'cinder/files/backup_backend/_' ~ controller.backup.engine ~ '.conf' %}
{%- include backup_backend_fragment %}
{%- endif %}
diff --git a/cinder/files/rocky/cinder.conf.volume.Debian b/cinder/files/rocky/cinder.conf.volume.Debian
index 4b82a8d..a9dd2ad 100644
--- a/cinder/files/rocky/cinder.conf.volume.Debian
+++ b/cinder/files/rocky/cinder.conf.volume.Debian
@@ -1171,6 +1171,7 @@
[backend_defaults]
{%- if volume.backup.engine != None %}
+{%- set _data = volume %}
{%- set backup_backend_fragment = "cinder/files/backup_backend/_" + volume.backup.engine + ".conf" %}
{%- include backup_backend_fragment %}
{%- endif %}