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
This commit is contained in:
John Fulton 2022-03-26 16:12:19 -04:00
parent 7e83ddd5b5
commit c4136fc8f5

View File

@ -7,6 +7,7 @@ parameter_defaults:
CephSpecFqdn: true
{% endif -%}
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 }}