openstack
/
tripleo-ansible
Code Issues Proposed changes

Merge "Avoid failing if no pools/keys are specified"

This commit is contained in:
Zuul 2022-05-09 19:48:49 +00:00 committed by Gerrit Code Review
parent 0de1311402 7d32bad0ae
commit 04a9cac47e
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