openstack
/
tripleo-ansible
Code Issues Proposed changes

Set tripleo_ceph_client_vars consistently with THT 

The TripleO Heat Templates parameter CephClientConfigVars
defaults to "{{ playbook_dir }}/cephadm/ceph_client.yml".
This parameter correlates with the the Ansible variable
tripleo_ceph_client_vars whose default is not the same.
This inconsistency can cause bug 1978846. This patch
changes tripleo-ansible so that they both have the same
default.

Change-Id: I58a8a1d058a76c1733c94c2be96bf59bb553946f
Closes-Bug: #1978846
This commit is contained in:
John Fulton 2022-06-17 16:31:02 -04:00 committed by Francesco Pantano
parent 95b800f4c3
commit 93cc215909
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tripleo_ansible/roles/tripleo_ceph_client/defaults/main.yml
View File

@ -22,7 +22,7 @@ tripleo_ceph_client_debug: "{{ (ansible_verbosity | int) >= 2 | bool }}"
tripleo_ceph_client_hide_sensitive_logs: true
tripleo_ceph_client_config_home: "/etc/ceph"
tripleo_ceph_client_fetch_dir: "{{ playbook_dir }}/ceph_client_fetch_dir"
tripleo_ceph_client_vars: "/home/stack/ceph_client.yaml"
tripleo_ceph_client_vars: "{{ playbook_dir }}/cephadm/ceph_client.yml"
tripleo_ceph_client_cluster: "ceph"
tripleo_ceph_client_fsid: ''
tripleo_ceph_client_mon_ips: []

2
tripleo_ansible/roles/tripleo_cephadm/defaults/main.yml
View File

@ -34,7 +34,7 @@ tripleo_cephadm_uid: "167"
tripleo_cephadm_mode: "0755"
tripleo_cephadm_keyring_permissions: "0644"
tripleo_ceph_client_config_home: "/etc/ceph"
tripleo_ceph_client_vars: "/home/stack/ceph_client.yaml"
tripleo_ceph_client_vars: "{{ playbook_dir }}/cephadm/ceph_client.yml"
tripleo_cephadm_dashboard_enabled: false
tripleo_cephadm_wait_for_mons: true
tripleo_cephadm_wait_for_mons_retries: 10