From 4a1fab391de6cd5e9d92d2e08c3a0d09728421df Mon Sep 17 00:00:00 2001 From: John Fulton Date: Tue, 12 Jul 2022 14:03:20 -0400 Subject: [PATCH] Override tripleo_ceph_client_vars in tripleo_run_cephadm role During config-download, the tripleo_run_cephadm role sets up overrides and creates a script which then calls tasks from the tripleo_cephadm role. When this happens it should override the tripleo_ceph_client_vars to have the correct config-download directory (relative to the current stack). The tripleo_cephadm_spec_ansible_host variable follows the same pattern. Change-Id: I658bc5c2e37ad5af6991937ccec0933b844ddd63 Closes-Bug: #1981467 --- tripleo_ansible/roles/tripleo_run_cephadm/tasks/prepare.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tripleo_ansible/roles/tripleo_run_cephadm/tasks/prepare.yml b/tripleo_ansible/roles/tripleo_run_cephadm/tasks/prepare.yml index 1f8b24462..dc981074b 100644 --- a/tripleo_ansible/roles/tripleo_run_cephadm/tasks/prepare.yml +++ b/tripleo_ansible/roles/tripleo_run_cephadm/tasks/prepare.yml @@ -106,6 +106,7 @@ tripleo_enabled_services: {{ enabled_services | default([]) }} tripleo_cephadm_fqdn: "{{ ceph_spec_fqdn | bool }}" tripleo_cephadm_spec_ansible_host: "{{ tripleo_run_cephadm_spec_path }}" + tripleo_ceph_client_vars: "{{ playbook_dir }}/cephadm/ceph_client.yml" tripleo_cephadm_internal_tls_enabled: "{{ enable_internal_tls }}" tripleo_cephadm_num_osd_expected: "{{ groups['ceph_osd'] | default([]) | length }}" tripleo_cephadm_deployed_ceph: {{ tripleo_cephadm_deployed_ceph | default(false) }}