Parameterize option rbd_flatten_volume_from_snapshot.
diff --git a/cinder/files/backend/_ceph.conf b/cinder/files/backend/_ceph.conf
index 6455459..b226d77 100644
--- a/cinder/files/backend/_ceph.conf
+++ b/cinder/files/backend/_ceph.conf
@@ -22,6 +22,7 @@
# Flatten volumes created from snapshots to remove dependency
# from volume to snapshot (boolean value)
#rbd_flatten_volume_from_snapshot=false
+rbd_flatten_volume_from_snapshot={{ backend.get('flatten_volume_from_snapshot', 'false') }}
# The libvirt uuid of the secret for the rbd_user volumes
# (string value)
@@ -45,4 +46,4 @@
# Timeout value (in seconds) used when connecting to ceph
# cluster. If value < 0, no timeout is set and default
# librados value is used. (integer value)
-#rados_connect_timeout=-1
\ No newline at end of file
+#rados_connect_timeout=-1
diff --git a/cinder/files/juno/cinder.conf.controller.Debian b/cinder/files/juno/cinder.conf.controller.Debian
index 3961e82..19913e0 100644
--- a/cinder/files/juno/cinder.conf.controller.Debian
+++ b/cinder/files/juno/cinder.conf.controller.Debian
@@ -265,6 +265,7 @@
# Flatten volumes created from snapshots to remove dependency
# from volume to snapshot (boolean value)
#rbd_flatten_volume_from_snapshot=false
+rbd_flatten_volume_from_snapshot={{ volume.storage.get('flatten_volume_from_snapshot', 'false') }}
# The libvirt uuid of the secret for the rbd_user volumes
# (string value)
diff --git a/cinder/files/juno/cinder.conf.volume.Debian b/cinder/files/juno/cinder.conf.volume.Debian
index 64e0050..283fbff 100644
--- a/cinder/files/juno/cinder.conf.volume.Debian
+++ b/cinder/files/juno/cinder.conf.volume.Debian
@@ -329,6 +329,7 @@
# Flatten volumes created from snapshots to remove dependency
# from volume to snapshot (boolean value)
#rbd_flatten_volume_from_snapshot=false
+rbd_flatten_volume_from_snapshot={{ volume.storage.get('flatten_volume_from_snapshot', 'false') }}
# The libvirt uuid of the secret for the rbd_user volumes
# (string value)
diff --git a/cinder/files/kilo/cinder.conf.controller.Debian b/cinder/files/kilo/cinder.conf.controller.Debian
index d35b484..eba437b 100644
--- a/cinder/files/kilo/cinder.conf.controller.Debian
+++ b/cinder/files/kilo/cinder.conf.controller.Debian
@@ -302,6 +302,7 @@
# Flatten volumes created from snapshots to remove dependency
# from volume to snapshot (boolean value)
#rbd_flatten_volume_from_snapshot=false
+rbd_flatten_volume_from_snapshot={{ controller.storage.get('flatten_volume_from_snapshot', 'false') }}
# The libvirt uuid of the secret for the rbd_user volumes
# (string value)
diff --git a/cinder/files/kilo/cinder.conf.volume.Debian b/cinder/files/kilo/cinder.conf.volume.Debian
index 8bf4f8b..4acd2fc 100644
--- a/cinder/files/kilo/cinder.conf.volume.Debian
+++ b/cinder/files/kilo/cinder.conf.volume.Debian
@@ -366,6 +366,7 @@
# Flatten volumes created from snapshots to remove dependency
# from volume to snapshot (boolean value)
#rbd_flatten_volume_from_snapshot=false
+rbd_flatten_volume_from_snapshot={{ volume.storage.get('flatten_volume_from_snapshot', 'false') }}
# The libvirt uuid of the secret for the rbd_user volumes
# (string value)
diff --git a/cinder/files/liberty/cinder.conf.controller.Debian b/cinder/files/liberty/cinder.conf.controller.Debian
index 4e9582d..680fb64 100644
--- a/cinder/files/liberty/cinder.conf.controller.Debian
+++ b/cinder/files/liberty/cinder.conf.controller.Debian
@@ -315,6 +315,7 @@
# Flatten volumes created from snapshots to remove dependency
# from volume to snapshot (boolean value)
#rbd_flatten_volume_from_snapshot=false
+rbd_flatten_volume_from_snapshot={{ controller.storage.get('flatten_volume_from_snapshot', 'false') }}
# The libvirt uuid of the secret for the rbd_user volumes
# (string value)
diff --git a/cinder/files/liberty/cinder.conf.volume.Debian b/cinder/files/liberty/cinder.conf.volume.Debian
index 0ab8e54..8e61ac2 100644
--- a/cinder/files/liberty/cinder.conf.volume.Debian
+++ b/cinder/files/liberty/cinder.conf.volume.Debian
@@ -360,6 +360,7 @@
# Flatten volumes created from snapshots to remove dependency
# from volume to snapshot (boolean value)
#rbd_flatten_volume_from_snapshot=false
+rbd_flatten_volume_from_snapshot={{ volume.storage.get('flatten_volume_from_snapshot', 'false') }}
# The libvirt uuid of the secret for the rbd_user volumes
# (string value)