diff --git a/environments/manila-cephfsganesha-config.yaml b/environments/manila-cephfsganesha-config.yaml index 9a58fe3ba3..78e2345d7a 100644 --- a/environments/manila-cephfsganesha-config.yaml +++ b/environments/manila-cephfsganesha-config.yaml @@ -16,6 +16,7 @@ parameter_defaults: 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 - # 'NFS' (users mount shares through nfs-ganesha server) diff --git a/environments/manila-cephfsnative-config.yaml b/environments/manila-cephfsnative-config.yaml index d85109ec5a..7899ac1767 100644 --- a/environments/manila-cephfsnative-config.yaml +++ b/environments/manila-cephfsnative-config.yaml @@ -13,6 +13,7 @@ parameter_defaults: 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 - # 'NFS' (users mount shares through nfs-ganesha server) diff --git a/puppet/services/manila-backend-cephfs.yaml b/puppet/services/manila-backend-cephfs.yaml index b9dadaf937..80f731ad07 100644 --- a/puppet/services/manila-backend-cephfs.yaml +++ b/puppet/services/manila-backend-cephfs.yaml @@ -55,6 +55,9 @@ parameters: ManilaCephFSCephFSEnableSnapshots: type: boolean default: false + ManilaCephFSCephVolumeMode: + type: string + default: '0755' ManilaCephFSCephFSProtocolHelperType: default: CEPHFS description: Protocol type ('CEPHFS' or 'NFS') when cephfs back end @@ -89,6 +92,7 @@ outputs: 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::ceph_client_key: {get_param: CephManilaClientKey} manila::backend::cephfs::cephfs_protocol_helper_type: {get_param: ManilaCephFSCephFSProtocolHelperType} step_config: diff --git a/releasenotes/notes/Support-ceph_volume_mode-parameter-5553a9b39718a749.yaml b/releasenotes/notes/Support-ceph_volume_mode-parameter-5553a9b39718a749.yaml new file mode 100644 index 0000000000..c4c632de04 --- /dev/null +++ b/releasenotes/notes/Support-ceph_volume_mode-parameter-5553a9b39718a749.yaml @@ -0,0 +1,9 @@ +--- +features: + - | + Support setting values for ``cephfs_volume_mode`` manila parameter via + the THT parameter ManilaCephFSCephVolumeMode. These control the POSIX + rwx mode of the cephfs volumes, snapshots, and groups of these that back + corresponding manila resources. Default value for ManilaCephFSCephVolumeMode + is '0755', backwards-compatible with the mode for these objects before it + was settable.