Merge "set ganesha idmap.conf file path and overrides"

This commit is contained in:
Zuul 2021-06-07 13:44:28 +00:00 committed by Gerrit Code Review
commit 8569ec942f
3 changed files with 20 additions and 0 deletions

View File

@ -30,6 +30,13 @@ parameters:
ManilaCephFSCephFSAuthId: ManilaCephFSCephFSAuthId:
type: string type: string
default: 'manila' default: 'manila'
ManilaCephFSNFSIdmapConf:
type: string
default: '/etc/ganesha/idmap.conf'
ManilaCephFSNFSIdmapOverrides:
type: json
description: Extra config settings to dump into idmap.conf
default: {}
resources: resources:
CephBase: CephBase:
@ -123,6 +130,8 @@ outputs:
ceph_nfs_rados_backend: true ceph_nfs_rados_backend: true
ceph_nfs_disable_caching: true ceph_nfs_disable_caching: true
ceph_nfs_ceph_user: {get_param: ManilaCephFSCephFSAuthId} 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 - name: generate ceph-ansible group vars nfss
copy: copy:
dest: "{{playbook_dir}}/ceph-ansible/group_vars/nfss.yml" dest: "{{playbook_dir}}/ceph-ansible/group_vars/nfss.yml"

View File

@ -33,6 +33,13 @@ parameters:
ManilaCephFSCephFSAuthId: ManilaCephFSCephFSAuthId:
type: string type: string
default: 'manila' default: 'manila'
ManilaCephFSNFSIdmapConf:
type: string
default: '/etc/ganesha/idmap.conf'
ManilaCephFSNFSIdmapOverrides:
type: json
description: Extra config settings to dump into idmap.conf
default: {}
resources: resources:
CephBase: CephBase:

View File

@ -20,6 +20,10 @@ parameter_defaults:
# (users mount shares directly from ceph cluster), or nfs-ganesha backend - # (users mount shares directly from ceph cluster), or nfs-ganesha backend -
# 'NFS' (users mount shares through nfs-ganesha server) # 'NFS' (users mount shares through nfs-ganesha server)
ManilaCephFSCephFSProtocolHelperType: 'NFS' 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 # 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 # external and you need to use a specific keyring/key and pool to access the
# CephFS share # CephFS share