diff --git a/deployment/cinder/cinder-volume-container-puppet.yaml b/deployment/cinder/cinder-volume-container-puppet.yaml
index 9827e82673..4bddada638 100644
--- a/deployment/cinder/cinder-volume-container-puppet.yaml
+++ b/deployment/cinder/cinder-volume-container-puppet.yaml
@@ -151,6 +151,13 @@ parameters:
       list. This is in addition to the standard RBD backend driver
       associated with the CinderRbdPoolName.
     type: comma_delimited_list
+
+  CinderRbdFlattenVolumeFromSnapshot:
+    default: false
+    description: >
+      Whether RBD volumes created from a snapshot should be flattened
+      in order to remove a dependency on the snapshot.
+    type: boolean
   CephClusterFSID:
     type: string
     description: The Ceph cluster FSID. Must be a UUID.
@@ -218,6 +225,7 @@ outputs:
             tripleo::profile::base::cinder::volume::rbd::cinder_rbd_extra_pools: {get_param: CinderRbdExtraPools}
             tripleo::profile::base::cinder::volume::rbd::cinder_rbd_secret_uuid: {get_param: CephClusterFSID}
             tripleo::profile::base::cinder::volume::rbd::cinder_rbd_user_name: {get_param: CephClientUserName}
+            tripleo::profile::base::cinder::volume::rbd::cinder_rbd_flatten_volume_from_snapshot: {get_param: CinderRbdFlattenVolumeFromSnapshot}
             tripleo::cinder_volume::firewall_rules:
               '120 iscsi initiator':
                 dport: 3260
diff --git a/releasenotes/notes/add-cinder-rbd-flatten-parameter-3951b341262488fe.yaml b/releasenotes/notes/add-cinder-rbd-flatten-parameter-3951b341262488fe.yaml
new file mode 100644
index 0000000000..dfb09eed99
--- /dev/null
+++ b/releasenotes/notes/add-cinder-rbd-flatten-parameter-3951b341262488fe.yaml
@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    Add CinderRbdFlattenVolumeFromSnapshot parameter to control whether
+    cinder RBD volumes created from a snapshot should be flattened in order
+    remove a dependency on the snapshot. The default value is False, which
+    is the same as the cinder RBD driver's default value.