From a45f056604e51f876129ccbbc780ca4f06dffb20 Mon Sep 17 00:00:00 2001 From: Goutham Pacha Ravi Date: Tue, 1 Mar 2022 20:28:22 +0530 Subject: [PATCH] Fix attr corresponding to ManilaCephFSNFSIdmapOverrides The heat template parameter allows setting a ceph-ansible variable that is meant to override specific section/s of the idmapd.conf file used by nfs-ganesha. The ceph-ansible variable was incorrect [1]. This problem doesn't exist in stable/wallaby and beyond since we don't use ceph-ansible with those branches [2]. Original commit: I422e49f0027efbbb25256d8b4718eb0aa78d90a4 [1] https://github.com/ceph/ceph-ansible/commit/2db2208e406df83806c264207e7df90623add154 [2] https://opendev.org/openstack/tripleo-ansible/src/commit/963d607c49f00e02512808513757c808f091b45f/tripleo_ansible/roles/tripleo_cephadm/tasks/ganesha/start_nfs.yaml Change-Id: Idd98edcf60fe0220a25aadbdc9e3214258dafa4c Signed-off-by: Goutham Pacha Ravi (cherry picked from commit fae044730577ffb3737397ed50fb8a6c78bf6276) (cherry picked from commit 4eef893c1a33cc2d6152fb2c1b0959e344d87742) --- deployment/ceph-ansible/ceph-nfs.yaml | 2 +- environments/manila-cephfsganesha-config.yaml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/deployment/ceph-ansible/ceph-nfs.yaml b/deployment/ceph-ansible/ceph-nfs.yaml index 0a4f433e71..771d6d11a2 100644 --- a/deployment/ceph-ansible/ceph-nfs.yaml +++ b/deployment/ceph-ansible/ceph-nfs.yaml @@ -68,7 +68,7 @@ resources: 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} + idmap_conf_overrides: {get_param: ManilaCephFSNFSIdmapOverrides} outputs: role_data: diff --git a/environments/manila-cephfsganesha-config.yaml b/environments/manila-cephfsganesha-config.yaml index 89cc9b8ddc..0384a21757 100644 --- a/environments/manila-cephfsganesha-config.yaml +++ b/environments/manila-cephfsganesha-config.yaml @@ -23,6 +23,10 @@ parameter_defaults: # 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 + # Example: + # ManilaCephFSNFSIdmapOverrides: + # General: + # Domain: testing.openstack.tripleo.org 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