Salt/salt-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2024-11-30 21:45:25 +01:00
Code Issues Activity

fix indenting around peer run. Convert extra configs from json to yaml

Browse Source
This commit is contained in:
Christian McHugh 2017-08-28 07:04:43 +01:00
parent d6389b8a24
commit d5c10f5600
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1443,21 +1443,21 @@ peer:
{% if 'peer_run' in cfg_master %} {% if 'peer_run' in cfg_master %}
{%- do default_keys.append('peer_run') %} {%- do default_keys.append('peer_run') %}
peer_run: peer_run:
{% for name, roots in cfg_master['peer_run'].items() %} {%- for name, roots in cfg_master['peer_run'].items() %}
{{ name }}: {{ name }}:
{% for mod in roots %} {%- for mod in roots %}
- {{ mod }} - {{ mod }}
{% endfor %} {%- endfor %}
{% endfor %} {%- endfor %}
{% elif 'peer_run' in cfg_salt %} {%- elif 'peer_run' in cfg_salt %}
peer_run: peer_run:
{% for name, roots in cfg_salt['peer_run'].items() %} {%- for name, roots in cfg_salt['peer_run'].items() %}
{{ name }}: {{ name }}:
{% for mod in roots %} {%- for mod in roots %}
- {{ mod }} - {{ mod }}
{% endfor %} {%- endfor %}
{% endfor %} {%- endfor %}
{% endif %} {%- endif %}
##### Mine settings ##### ##### Mine settings #####
##################################### #####################################
@ -1776,6 +1776,7 @@ alternative.mongo.{{ name }}: {{ value }}
{%- for configname in cfg_master %} {%- for configname in cfg_master %}
{%- if configname not in reserved_keys and configname not in default_keys %} {%- if configname not in reserved_keys and configname not in default_keys %}
{{ configname }}: {{ cfg_master[configname]|json }} {{ configname }}:
{{ cfg_master[configname]| yaml(False) | indent(2) }}
{%- endif %} {%- endif %}
{%- endfor %} {%- endfor %}