Browse Source

Merge "Default CephClientConfigVars within --working-dir"

changes/15/778915/17
Zuul 6 months ago
committed by Gerrit Code Review
parent
commit
877b3acd88
  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