diff --git a/manifests/backend/cephfs.pp b/manifests/backend/cephfs.pp index 01e5337a..a8d2f1f2 100644 --- a/manifests/backend/cephfs.pp +++ b/manifests/backend/cephfs.pp @@ -59,6 +59,11 @@ # hosting the Ganesha service (prevails on server_password) # Defaults to: $facts['os_service_default'] # +# [*cephfs_nfs_cluster_id*] +# (optional) ID of the NFS cluster to use (when using ceph orchestrator +# deployed clustered NFS service) +# Defaults to: $facts['os_service_default'] +# # [*cephfs_volume_mode*] # (optional) octal rwx permissions for CephFS backing volumes, # snapshots, and groups of volumes and snapshots. @@ -100,6 +105,7 @@ define manila::backend::cephfs ( $cephfs_ganesha_server_username = $facts['os_service_default'], $cephfs_ganesha_server_password = $facts['os_service_default'], $cephfs_ganesha_path_to_private_key = $facts['os_service_default'], + $cephfs_nfs_cluster_id = $facts['os_service_default'], $cephfs_volume_mode = $facts['os_service_default'], $cephfs_protocol_helper_type = 'CEPHFS', $cephfs_filesystem_name = $facts['os_service_default'], @@ -126,6 +132,7 @@ define manila::backend::cephfs ( "${name}/cephfs_ganesha_server_username": value => $cephfs_ganesha_server_username; "${name}/cephfs_ganesha_server_password": value => $cephfs_ganesha_server_password, secret => true; "${name}/cephfs_ganesha_path_to_private_key": value => $cephfs_ganesha_path_to_private_key; + "${name}/cephfs_nfs_cluster_id": value => $cephfs_nfs_cluster_id; "${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; diff --git a/releasenotes/notes/cephfs_nfs_cluster_id-cab5f8d5044e6b06.yaml b/releasenotes/notes/cephfs_nfs_cluster_id-cab5f8d5044e6b06.yaml new file mode 100644 index 00000000..32c5424e --- /dev/null +++ b/releasenotes/notes/cephfs_nfs_cluster_id-cab5f8d5044e6b06.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + The new ``manila::backend::cephfs::cephfs_nfs_cluster_id`` parameter has been added. diff --git a/spec/defines/manila_backend_cephfs_spec.rb b/spec/defines/manila_backend_cephfs_spec.rb index a6d50cb2..32c3b704 100644 --- a/spec/defines/manila_backend_cephfs_spec.rb +++ b/spec/defines/manila_backend_cephfs_spec.rb @@ -19,6 +19,7 @@ describe 'manila::backend::cephfs' do :cephfs_ganesha_server_is_remote => true, :cephfs_ganesha_server_username => 'ganeshadmin', :cephfs_ganesha_path_to_private_key => '/readable/by/manila.key', + :cephfs_nfs_cluster_id => 'mycephfsnfscluster', :cephfs_volume_mode => '0775', :cephfs_filesystem_name => 'cephfs', :reserved_share_percentage => 10.0, @@ -54,6 +55,8 @@ describe 'manila::backend::cephfs' do 'ganeshadmin') is_expected.to contain_manila_config('cephfs/cephfs_ganesha_path_to_private_key').with_value( '/readable/by/manila.key') + is_expected.to contain_manila_config('cephfs/cephfs_nfs_cluster_id').with_value( + 'mycephfsnfscluster') is_expected.to contain_manila_config('cephfs/cephfs_filesystem_name').with_value( 'cephfs') is_expected.to contain_manila_config('cephfs/reserved_share_percentage').with_value(10.0)