From 1590be90f116c85816f100de4b02cb1fc63a223f Mon Sep 17 00:00:00 2001
From: John Fulton <fulton@redhat.com>
Date: Wed, 28 Apr 2021 13:53:32 +0000
Subject: [PATCH] Default CephClientConfigVars within --working-dir

As per I0d803f695c725c58ef2e6b655753b6c8248d1b2f, all files
created by the overcloud deploy command should be in the
tripleo working directory instead of using tmp dirs or files
directly in $HOME.

Change the default of CephClientConfigVars so that it doesn't
genereate the ceph_client.yml in /home/stack but instead puts
it in the cephadm directory within config-download as per the
value of {{ playbook_dir }} when ansible evaluates it. This
will result in the ceph_client.yml also being within the working
directory.

Change-Id: Ia6829fb8a85776878b737d1ae2c5567c2fd2ed1e
---
 ci/environments/scenario001-standalone.yaml | 1 -
 deployment/cephadm/ceph-base.yaml           | 2 +-
 deployment/cephadm/ceph-client.yaml         | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ci/environments/scenario001-standalone.yaml b/ci/environments/scenario001-standalone.yaml
index ce2ab86591..8fd714bdd4 100644
--- a/ci/environments/scenario001-standalone.yaml
+++ b/ci/environments/scenario001-standalone.yaml
@@ -186,7 +186,6 @@ parameter_defaults:
   CephMsgrSecureMode: true
   CephAnsibleSkipClient: false
   CephConfigPath: "/etc/ceph"
-  CephClientConfigVars: "{{ playbook_dir }}/cephadm/ceph_client.yml"
   LVMFilterEnabled: true
   LVMFilterAllowlist:
     - /dev/loop2
diff --git a/deployment/cephadm/ceph-base.yaml b/deployment/cephadm/ceph-base.yaml
index 822472ff4d..277a7c6b16 100644
--- a/deployment/cephadm/ceph-base.yaml
+++ b/deployment/cephadm/ceph-base.yaml
@@ -298,7 +298,7 @@ parameters:
     type: boolean
     default: false
   CephClientConfigVars:
-    default: "/home/stack/ceph_client.yml"
+    default: "{{ playbook_dir }}/cephadm/ceph_client.yml"
     type: string
     description: The undercloud path where cephadm exports the Ceph Client configuration.
   CephAnsibleSkipClient:
diff --git a/deployment/cephadm/ceph-client.yaml b/deployment/cephadm/ceph-client.yaml
index 60e00fe277..8cba6ffbcf 100644
--- a/deployment/cephadm/ceph-client.yaml
+++ b/deployment/cephadm/ceph-client.yaml
@@ -64,7 +64,7 @@ parameters:
     description: |
       The path where the Ceph Cluster config files are stored on the host.
   CephClientConfigVars:
-    default: "/home/stack/ceph_client.yml"
+    default: "{{ playbook_dir }}/cephadm/ceph_client.yml"
     type: string
     description: The undercloud path where cephadm exports the Ceph Client configuration.