diff --git a/deployment/ceph-ansible/ceph-nfs.yaml b/deployment/ceph-ansible/ceph-nfs.yaml index b7488189b4..4c450e0909 100644 --- a/deployment/ceph-ansible/ceph-nfs.yaml +++ b/deployment/ceph-ansible/ceph-nfs.yaml @@ -30,6 +30,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: @@ -123,6 +130,8 @@ outputs: 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} - name: generate ceph-ansible group vars nfss copy: dest: "{{playbook_dir}}/ceph-ansible/group_vars/nfss.yml" diff --git a/deployment/cephadm/ceph-nfs.yaml b/deployment/cephadm/ceph-nfs.yaml index cf55660a3c..d31f0bbfe3 100644 --- a/deployment/cephadm/ceph-nfs.yaml +++ b/deployment/cephadm/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: diff --git a/environments/manila-cephfsganesha-config.yaml b/environments/manila-cephfsganesha-config.yaml index 11ffd3a7f8..89cc9b8ddc 100644 --- a/environments/manila-cephfsganesha-config.yaml +++ b/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