Merge "Deprecate ineffective ManilaCephFSCephFSEnableSnapshots"

deployment/manila/manila-backend-cephfs.yaml

@@ -57,9 +57,6 @@ parameters:
   ManilaCephFSCephFSAuthId:
     type: string
     default: 'manila'
-  ManilaCephFSCephFSEnableSnapshots:
-    type: boolean
-    default: false
   ManilaCephFSCephVolumeMode:
     type: string
     default: '0755'
@@ -70,6 +67,23 @@ parameters:
     type: string
     constraints:
     - allowed_values: ['CEPHFS', 'NFS']
+  # Deprecated parameters
+  ManilaCephFSCephFSEnableSnapshots:
+    type: boolean
+    description: |
+      Enable snapshot support in CephFS driver. Note that this parameter has
+      no effect now and snapshot support is always enabled.
+    default: false
+
+parameter_groups:
+- label: deprecated
+  description: |
+    The following parameters are deprecated and will be removed. They should not
+    be relied on for new deployments. If you have concerns regarding deprecated
+    parameters, please contact the TripleO development team on IRC or the
+    OpenStack mailing list.
+  parameters:
+  - ManilaCephFSCephFSEnableSnapshots
 
 outputs:
   role_data:
@@ -90,6 +104,5 @@ outputs:
             - .conf
         manila::backend::cephfs::cephfs_auth_id: {get_param: ManilaCephFSCephFSAuthId}
         manila::backend::cephfs::cephfs_cluster_name: {get_param: CephClusterName}
-        manila::backend::cephfs::cephfs_enable_snapshots: {get_param: ManilaCephFSCephFSEnableSnapshots}
         manila::backend::cephfs::cephfs_volume_mode: {get_param: ManilaCephFSCephVolumeMode}
         manila::backend::cephfs::cephfs_protocol_helper_type: {get_param: ManilaCephFSCephFSProtocolHelperType}

environments/manila-cephfsganesha-config.yaml

@@ -14,7 +14,6 @@ resource_registry:
 parameter_defaults:
   ManilaCephFSBackendName: cephfs
   ManilaCephFSDriverHandlesShareServers: false
-  ManilaCephFSCephFSEnableSnapshots: false
   ManilaCephFSCephVolumeMode: '0755'
   # manila cephfs driver supports either native cephfs backend - 'CEPHFS'
   # (users mount shares directly from ceph cluster), or nfs-ganesha backend -

environments/manila-cephfsnative-config.yaml

@@ -12,7 +12,6 @@ parameter_defaults:
   ManilaCephFSBackendName: cephfs
   ManilaCephFSDriverHandlesShareServers: false
   ManilaCephFSCephFSAuthId: 'manila'
-  ManilaCephFSCephFSEnableSnapshots: false
   ManilaCephFSCephVolumeMode: '0755'
   # manila cephfs driver supports either native cephfs backend - 'CEPHFS'
   # (users mount shares directly from ceph cluster), or nfs-ganesha backend -

releasenotes/notes/deprecate-manila-cephfs-enable-snapshot-7857604802378720.yaml

@@ -0,0 +1,6 @@
+---
+deprecations:
+  - |
+    The ``ManilaCephFSCephFSEnableSnapshots`` parameter has been deprecated,
+    and has no effect now. Manila always enables snapshot support in Ceph FS
+    backend since Wallaby.