saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

Merge pull request #313 from iondulgheru/master

Browse Source 
Fix master_tops configuration rendering
This commit is contained in:
Niels Abspoel 2017-08-13 22:38:48 +02:00 committed by GitHub
commit d6389b8a24
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
salt/files/master.d/f_defaults.conf
View File

@ -746,14 +746,21 @@ rosters:
{%- do default_keys.append('master_tops') %} {%- do default_keys.append('master_tops') %}
master_tops: master_tops:
{%- for master in cfg_master['master_tops'] -%} {%- for master in cfg_master['master_tops'] -%}
{%- if cfg_master['master_tops'][master] is string %} {%- if cfg_master['master_tops'][master] is mapping %}
{{ master }}: {{ cfg_master['master_tops'][master] }}
{%- else %}
{{ master }}: {{ master }}:
{%- for parameter in cfg_master['master_tops'][master] %} {%- for parameter in cfg_master['master_tops'][master] %}
{{ parameter }}: {{ cfg_master['master_tops'][master][parameter] }} {{ parameter }}: {{ cfg_master['master_tops'][master][parameter] }}
{%- endfor -%} {%- endfor -%}
{%- endif -%} {%- elif cfg_master['master_tops'][master] is string %}
{{ master }}: {{ cfg_master['master_tops'][master] }}
{%- elif cfg_master['master_tops'][master] is iterable %}
{{ master }}:
{%- for item in cfg_master['master_tops'][master] %}
- {{ item }}
{%- endfor -%}
{%- else %}
{{ master }}: {{ cfg_master['master_tops'][master] }}
{% endif %}
{%- endfor %} {%- endfor %}
{% endif %} {% endif %}