openstack
/
tripleo-ansible
Code Issues Proposed changes

Avoid failing if no pools/keys are specified 

This patch adds a check on the variables generated by deployed ceph.
If one of those variables is skipped in tripleoclient, we need to
make sure the content of the if statement is not created.

Change-Id: Ic52ee6091ebab6f937a4a15c83a28f0b3918d374
This commit is contained in:
Francesco Pantano 2022-05-04 14:52:12 +02:00 committed by John Fulton
parent b356e09ad2
commit 7d32bad0ae
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tripleo_ansible/roles/tripleo_cephadm/templates/deployed_ceph.yaml.j2
View File

@ -9,16 +9,16 @@ parameter_defaults:
CephadmDefaultContainer: {{ tripleo_cephadm_default_container }}
ContainerCephDaemonImage: {{ tripleo_cephadm_container_ns }}/{{ tripleo_cephadm_container_image }}:{{ tripleo_cephadm_container_tag | string }}
CephClusterName: {{ tripleo_cephadm_cluster }}
{% if tripleo_cephadm_pools -%}
{% if tripleo_cephadm_pools | default([]) | length > 0 -%}
CephPools: {{ tripleo_cephadm_pools }}
{% endif -%}
{% if tripleo_ceph_client_vars -%}
{% if tripleo_ceph_client_vars | default('') | length > 0 -%}
CephClientConfigVars: {{ tripleo_ceph_client_vars }}
{% endif -%}
{% if ceph_client_username -%}
{% if ceph_client_username | default('') | length > 0 -%}
CephClientUserName: {{ ceph_client_username }}
{% endif -%}
{% if ceph_client_key -%}
{% if ceph_client_key | default('') | length > 0 -%}
CephClientKey: {{ ceph_client_key }}
{% endif -%}
# Recommendation: set the following to false after overcloud is deployed