Merge "set ganesha idmap.conf file path and overrides" into stable/victoria

deployment/ceph-ansible/ceph-nfs.yaml

@@ -33,6 +33,13 @@ parameters:
   ManilaCephFSCephFSAuthId:
     type: string
     default: 'manila'
+  ManilaCephFSNFSIdmapConf:
+    type: string
+    default: '/etc/ganesha/idmap.conf'
+  ManilaCephFSNFSIdmapOverrides:
+    type: json
+    description: Extra config settings to dump into idmap.conf
+    default: {}
 
 resources:
   CephBase:
@@ -60,6 +67,8 @@ resources:
           ceph_nfs_rados_backend: true
           ceph_nfs_disable_caching: true
           ceph_nfs_ceph_user: {get_param: ManilaCephFSCephFSAuthId}
+          ceph_nfs_idmap_conf: {get_param: ManilaCephFSNFSIdmapConf}
+          ceph_nfs_idmap_overrides: {get_param: ManilaCephFSNFSIdmapOverrides}
 
 outputs:
   role_data:

environments/manila-cephfsganesha-config.yaml

@@ -20,6 +20,10 @@ parameter_defaults:
   # (users mount shares directly from ceph cluster), or nfs-ganesha backend -
   # 'NFS' (users mount shares through nfs-ganesha server)
   ManilaCephFSCephFSProtocolHelperType: 'NFS'
+  # Use ManilaCephFSNFSIdmapConf to change the path of the idmap.conf file consumed by ganesha
+  ManilaCephFSNFSIdmapConf: '/etc/ganesha/idmap.conf'
+  # Use ManilaCephFSNFSIdmapOverrides to overide ini configuration in the idmap.conf file
+  ManilaCephFSNFSIdmapOverrides: {}
   # Uncomment the following and set them appropriately if the Ceph cluster is
   # external and you need to use a specific keyring/key and pool to access the
   # CephFS share