Merge "Remove CephConfigOverrides from tripleo ceph client role"
This commit is contained in:
commit
e94facaeb6
|
@ -18,19 +18,9 @@ mon host = {% if tripleo_ceph_client_mon_ips is defined and tripleo_ceph_client_
|
||||||
{{ external_cluster_mon_ips }}
|
{{ external_cluster_mon_ips }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{# Build CephConfigOverrides #}
|
|
||||||
{% for key, value in (config_overrides | default({})).items() %}
|
|
||||||
{% if not (['global', 'mon', 'mgr', 'osd', 'mds', 'client']) | intersect([key]) %}
|
|
||||||
{{ key }} = {{ value }}
|
|
||||||
{% elif (['global']) | intersect([key]) %}
|
|
||||||
{# Merge global defined values into this section #}
|
|
||||||
{{ render_map(value) }}
|
|
||||||
{% endif %}
|
|
||||||
{% endfor %}
|
|
||||||
|
|
||||||
{# Build the remaining sections #}
|
{# Build the remaining sections #}
|
||||||
{% for key, value in (config_overrides | default({})).items() %}
|
{% for key, value in (config_overrides | default({})).items() %}
|
||||||
{% if (['mon', 'mgr', 'osd', 'mds', 'client']) | intersect([key]) %}
|
{% if (['client']) | intersect([key]) %}
|
||||||
[{{ key }}]
|
[{{ key }}]
|
||||||
{# Render the current section #}
|
{# Render the current section #}
|
||||||
{{ render_map(value) }}
|
{{ render_map(value) }}
|
||||||
|
|
Loading…
Reference in New Issue