openstack
/
tripleo-ansible
Code Issues Proposed changes

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)
This commit is contained in:
Francesco Pantano 2021-05-26 13:29:28 +02:00
parent 7062ca0f8e
commit 1b1f2a955b
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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) }}