openstack/puppet-manila
Code Issues Proposed changes

cephfs: Add support for the cephfs_filesystem_name parameter

Browse Source 
Depends-on: https://review.opendev.org/779619
Change-Id: Iea456f22e7832a3c468168c153c79705b93572cb
This commit is contained in:
Takashi Kajinami 2021-11-15 16:01:36 +09:00
parent 6653fe35c0
commit 6f8076415f
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/backend/cephfs.pp
View File

@ -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;
}
}

5
releasenotes/notes/cephfs_filesystem_name-1fb08f432fdf9af1.yaml Normal file
View File

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

6
spec/defines/manila_backend_cephfs_spec.rb
View File

@ -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