From 2c7f55cf1a2c259f39009ef38f6af250bfc397d5 Mon Sep 17 00:00:00 2001
From: Tom Barron <tpb@dyncloud.net>
Date: Fri, 22 Feb 2019 17:12:06 -0500
Subject: [PATCH] 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

Depends-on: https://review.openstack.org/#/c/640203/
Change-Id: I0e3f841523dc0cc213100296bc352ac88eb1ff74
(cherry picked from commit 127dbb4e815b26fcfc32fbf2a498380dcb010e8a)
(cherry picked from commit d8740f616a698547174c1a94e75bc82ee032e1a7)
---
 environments/manila-cephfsganesha-config.yaml            | 1 +
 environments/manila-cephfsnative-config.yaml             | 1 +
 puppet/services/manila-backend-cephfs.yaml               | 4 ++++
 ...port-ceph_volume_mode-parameter-5553a9b39718a749.yaml | 9 +++++++++
 4 files changed, 15 insertions(+)
 create mode 100644 releasenotes/notes/Support-ceph_volume_mode-parameter-5553a9b39718a749.yaml

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.