Merge "cephfs: Add support for the cephfs_filesystem_name parameter"

manifests/backend/cephfs.pp

@@ -68,6 +68,11 @@
 #   (optional) Sets helper type for CephFS driver, can be CEPHFS or NFS
 #   Defaults to: CEPHFS
 #
+# [*cephfs_filesystem_name*]
+#   (optional) The name of the filesystem to use, if there are multiple
+#   filesystems in the cluster.
+#   Defaults to: $::os_service_default
+#
 define manila::backend::cephfs (
   $driver_handles_share_servers       = false,
   $share_backend_name                 = $name,
@@ -83,6 +88,7 @@ define manila::backend::cephfs (
   $cephfs_ganesha_path_to_private_key = undef,
   $cephfs_volume_mode                 = $::os_service_default,
   $cephfs_protocol_helper_type        = 'CEPHFS',
+  $cephfs_filesystem_name             = $::os_service_default,
 ) {
 
   include manila::deps
@@ -105,5 +111,6 @@ define manila::backend::cephfs (
     "${name}/cephfs_ganesha_path_to_private_key": value => $cephfs_ganesha_path_to_private_key;
     "${name}/cephfs_volume_mode":                 value => $cephfs_volume_mode;
     "${name}/cephfs_protocol_helper_type":        value => $cephfs_protocol_helper_type;
+    "${name}/cephfs_filesystem_name":             value => $cephfs_filesystem_name;
   }
 }

releasenotes/notes/cephfs_filesystem_name-1fb08f432fdf9af1.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The new ``manila::backend::cephfs::cephfs_filesystem_name`` parameter has
+    been added.

spec/defines/manila_backend_cephfs_spec.rb

@@ -19,6 +19,7 @@ describe 'manila::backend::cephfs' do
         :cephfs_ganesha_server_username     => 'ganeshadmin',
         :cephfs_ganesha_path_to_private_key => '/readable/by/manila.key',
         :cephfs_volume_mode                 => '0775',
+        :cephfs_filesystem_name             => 'cephfs',
       }
     end
 
@@ -48,8 +49,9 @@ describe 'manila::backend::cephfs' do
       is_expected.to contain_manila_config('cephfs/cephfs_ganesha_server_username').with_value(
         'ganeshadmin')
       is_expected.to contain_manila_config('cephfs/cephfs_ganesha_path_to_private_key').with_value(
-        '/readable/by/manila.key'
-      )
+        '/readable/by/manila.key')
+      is_expected.to contain_manila_config('cephfs/cephfs_filesystem_name').with_value(
+        'cephfs')
     end
 
   end