Browse Source

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
changes/96/788496/2
John Fulton 7 months ago
parent
commit
1590be90f1
  1. 1
      ci/environments/scenario001-standalone.yaml
  2. 2
      deployment/cephadm/ceph-base.yaml
  3. 2
      deployment/cephadm/ceph-client.yaml

1
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

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

2
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.

Loading…
Cancel
Save