From 665450045824726296d3c9b7a0b4e138231d42f9 Mon Sep 17 00:00:00 2001 From: John Fulton Date: Sat, 26 Mar 2022 16:12:19 -0400 Subject: [PATCH] Pass CephClusterName in deployed Ceph template If the user overrides the tripleo_cephadm_cluster variable, then we should pass the same value through to the deployed Ceph template to ensure that it is consistent during overcloud deployment. Also, make ApplyCephConfigOverridesOnUpdate the last parameter in the template so that it is easier for users to see and follow the commented recommendation. Related-Bug: #1966559 Change-Id: I4daab327c0bdac2bcc569cc1d8d629c648ddf292 (cherry picked from commit c4136fc8f5e3a50668a6107aee1e5fc3535a6781) --- .../roles/tripleo_cephadm/templates/deployed_ceph.yaml.j2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tripleo_ansible/roles/tripleo_cephadm/templates/deployed_ceph.yaml.j2 b/tripleo_ansible/roles/tripleo_cephadm/templates/deployed_ceph.yaml.j2 index 5c23018e9..9af46f11e 100644 --- a/tripleo_ansible/roles/tripleo_cephadm/templates/deployed_ceph.yaml.j2 +++ b/tripleo_ansible/roles/tripleo_cephadm/templates/deployed_ceph.yaml.j2 @@ -4,6 +4,7 @@ parameter_defaults: CephDynamicSpec: false DeployedCeph: true CephadmDefaultContainer: {{ tripleo_cephadm_default_container }} + ContainerCephDaemonImage: {{ tripleo_cephadm_container_ns }}/{{ tripleo_cephadm_container_image }}:{{ tripleo_cephadm_container_tag | string }} + CephClusterName: {{ tripleo_cephadm_cluster }} # Recommendation: set the following to false after overcloud is deployed ApplyCephConfigOverridesOnUpdate: true - ContainerCephDaemonImage: {{ tripleo_cephadm_container_ns }}/{{ tripleo_cephadm_container_image }}:{{ tripleo_cephadm_container_tag | string }}