Browse Source

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

changes/55/773355/25
Zuul 1 week ago
committed by Gerrit Code Review
parent
commit
8569ec942f
3 changed files with 20 additions and 0 deletions
  1. +9
    -0
      deployment/ceph-ansible/ceph-nfs.yaml
  2. +7
    -0
      deployment/cephadm/ceph-nfs.yaml
  3. +4
    -0
      environments/manila-cephfsganesha-config.yaml

+ 9
- 0
deployment/ceph-ansible/ceph-nfs.yaml View File

@ -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"


+ 7
- 0
deployment/cephadm/ceph-nfs.yaml View File

@ -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:


+ 4
- 0
environments/manila-cephfsganesha-config.yaml View File

@ -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


Loading…
Cancel
Save