From 3ed6009630631e97b1017100c1fb0126b691d593 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Mon, 24 May 2021 23:59:02 +0200 Subject: [PATCH] Pass custom CephConfigPath parameter to ceph-nfs role This is necessary for the systemd service to mount the correct location on the host Depends-On: I12155b4a88b811d701f9fb6d1506b5592b58767b Change-Id: Ib29585696be5d46f88731541a3333851deebd663 (cherry picked from commit 7150a747b4c47405e8cedf6127118fa73a7f9090) --- deployment/cephadm/ceph-nfs.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/deployment/cephadm/ceph-nfs.yaml b/deployment/cephadm/ceph-nfs.yaml index d31f0bbfe3..4a5e5e0d6a 100644 --- a/deployment/cephadm/ceph-nfs.yaml +++ b/deployment/cephadm/ceph-nfs.yaml @@ -40,6 +40,11 @@ parameters: type: json description: Extra config settings to dump into idmap.conf default: {} + CephConfigPath: + type: string + default: "/var/lib/tripleo-config/ceph" + description: | + The path where the Ceph Cluster config files are stored on the host. resources: CephBase: @@ -123,6 +128,7 @@ outputs: - name: set tripleo-ansible group vars set_fact: ceph_nfs_vars: + tripleo_ceph_client_config_home: {get_param: CephConfigPath} tripleo_cephadm_ceph_nfs_bind_addr: {get_param: [EndpointMap, GaneshaInternal, host_nobrackets]} tripleo_cephadm_ceph_nfs_enable_service: false tripleo_cephadm_ceph_nfs_use_pacemaker: true