openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Default CephClientConfigVars within --working-dir"

This commit is contained in:
Zuul 2021-04-30 01:53:45 +00:00 committed by Gerrit Code Review
parent 5583bfb3e4 1590be90f1
commit 877b3acd88
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ci/environments/scenario001-standalone.yaml
View File

@ -186,7 +186,6 @@ parameter_defaults:
CephMsgrSecureMode: true CephMsgrSecureMode: true
CephAnsibleSkipClient: false CephAnsibleSkipClient: false
CephConfigPath: "/etc/ceph" CephConfigPath: "/etc/ceph"
CephClientConfigVars: "{{ playbook_dir }}/cephadm/ceph_client.yml"
LVMFilterEnabled: true LVMFilterEnabled: true
LVMFilterAllowlist: LVMFilterAllowlist:
- /dev/loop2 - /dev/loop2

2
deployment/cephadm/ceph-base.yaml
View File

@ -298,7 +298,7 @@ parameters:
type: boolean type: boolean
default: false default: false
CephClientConfigVars: CephClientConfigVars:
default: "/home/stack/ceph_client.yml" default: "{{ playbook_dir }}/cephadm/ceph_client.yml"
type: string type: string
description: The undercloud path where cephadm exports the Ceph Client configuration. description: The undercloud path where cephadm exports the Ceph Client configuration.
CephAnsibleSkipClient: CephAnsibleSkipClient:

2
deployment/cephadm/ceph-client.yaml
View File

@ -64,7 +64,7 @@ parameters:
description: | description: |
The path where the Ceph Cluster config files are stored on the host. The path where the Ceph Cluster config files are stored on the host.
CephClientConfigVars: CephClientConfigVars:
default: "/home/stack/ceph_client.yml" default: "{{ playbook_dir }}/cephadm/ceph_client.yml"
type: string type: string
description: The undercloud path where cephadm exports the Ceph Client configuration. description: The undercloud path where cephadm exports the Ceph Client configuration.