Browse Source

Remove CephConfigOverrides from tripleo ceph client role

There's no reason to process overrides outside the client section
in this role; most of the options provided by CephConfigOverrides
are used by the ceph server daemons, and can be ignored here.
This change just removes the involved code, leaving the ability
to process the client section only.

Change-Id: I106180bf4211529cdfd35672293b344a35bcca46
(cherry picked from commit bb0ce71dfd)
changes/28/794628/1
Francesco Pantano 5 months ago
parent
commit
1b1f2a955b
  1. 12
      tripleo_ansible/roles/tripleo_ceph_client/templates/ceph_conf.j2

12
tripleo_ansible/roles/tripleo_ceph_client/templates/ceph_conf.j2

@ -18,19 +18,9 @@ mon host = {% if tripleo_ceph_client_mon_ips is defined and tripleo_ceph_client_
{{ external_cluster_mon_ips }}
{% 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 #}
{% for key, value in (config_overrides | default({})).items() %}
{% if (['mon', 'mgr', 'osd', 'mds', 'client']) | intersect([key]) %}
{% if (['client']) | intersect([key]) %}
[{{ key }}]
{# Render the current section #}
{{ render_map(value) }}

Loading…
Cancel
Save