openstack
/
puppet-manila
Code Issues Proposed changes

Support cephfs_volume_mode parameter 

manila now [1] supports configuring an octal value for the
rwx permissions mode of the cephfs volumes and snapshots
and groups of these that back manila shares, snapshots,
and groups.

Expose this parameter in the backend manifests for manila
with cephfs.

[1] https://review.openstack.org/#/c/614332
Change-Id: I28410e8c5e452ada87c7e64da637c699fcb1faba
This commit is contained in:
Tom Barron 2019-02-22 16:21:20 -05:00
parent 3b92af11b7
commit 43df3f7594
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/backend/cephfs.pp
View File

@ -33,6 +33,11 @@
# (optional) IP of a server where Ganesha service runs on.
# Defaults to: undef
#
# [*cephfs_volume_mode*]
# (optional) octal rwx permissions for CephFS backing volumes,
# snapshots, and groups of volumes and snapshots.
# Defaults to $::os_service_default
#
# [*cephfs_protocol_helper_type*]
# (optional) Sets helper type for CephFS driver, can be CEPHFS or NFS
# Defaults to: CEPHFS
@ -44,8 +49,9 @@ define manila::backend::cephfs (
$cephfs_auth_id = 'manila',
$cephfs_cluster_name = 'ceph',
$cephfs_enable_snapshots = false,
$cephfs_protocol_helper_type = 'CEPHFS',
$cephfs_ganesha_server_ip = undef,
$cephfs_volume_mode = $::os_service_default,
$cephfs_protocol_helper_type = 'CEPHFS',
) {
include ::manila::deps
@ -60,7 +66,8 @@ define manila::backend::cephfs (
"${name}/cephfs_auth_id": value => $cephfs_auth_id;
"${name}/cephfs_cluster_name": value => $cephfs_cluster_name;
"${name}/cephfs_enable_snapshots": value => $cephfs_enable_snapshots;
"${name}/cephfs_protocol_helper_type": value => $cephfs_protocol_helper_type;
"${name}/cephfs_ganesha_server_ip": value => $cephfs_ganesha_server_ip;
"${name}/cephfs_volume_mode": value => $cephfs_volume_mode;
"${name}/cephfs_protocol_helper_type": value => $cephfs_protocol_helper_type;
}
}

6
releasenotes/notes/Add-cephfs_volume_mode-parameter-8f6bf0eb5b6fc425.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
Support setting values for ``cephfs_volume_mode`` parameter which controls
the rwx mode of the cephfs volumes, snapshots, and groups of these
that back manila shares.

4
spec/defines/manila_backend_cephfs_spec.rb
View File

@ -14,6 +14,7 @@ describe 'manila::backend::cephfs' do
:cephfs_enable_snapshots => true,
:cephfs_protocol_helper_type => 'NFS',
:cephfs_ganesha_server_ip => '10.0.0.1',
:cephfs_volume_mode => '0775'
}
end
@ -34,6 +35,9 @@ describe 'manila::backend::cephfs' do
'NFS')
is_expected.to contain_manila_config('cephfs/cephfs_ganesha_server_ip').with_value(
'10.0.0.1')
is_expected.to contain_manila_config('cephfs/cephfs_volume_mode').with_value(
'0775'
)
end
end