Salt
/
salt-formula
mirror of https://github.com/saltstack-formulas/salt-formula.git
0
0
Fork 0
Code Issues Activity

Merge pull request #518 from ze42/sorted_extra_options 

fix: sort extra options in configuration
This commit is contained in:
Niels Abspoel 2021-12-04 21:17:19 +01:00 committed by GitHub
parent 7c5489a50e 89cdcec595
commit 7d26191578
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1825,7 +1825,7 @@ alternative.mongo.{{ name }}: {{ value }}
{% endif %} {% endif %}
{%- endif %} {%- endif %}
{%- for configname in cfg_master %} {%- for configname in cfg_master|sort %}
{%- 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 }}: {{ configname }}:
{{ cfg_master[configname]| yaml(False) | indent(2) }} {{ cfg_master[configname]| yaml(False) | indent(2) }}

2
salt/files/minion.d/f_defaults.conf
View File

@ -1251,7 +1251,7 @@ alternative.mongo.{{ name }}: {{ value }}
{% endif %} {% endif %}
{%- endif %} {%- endif %}
{%- for configname in cfg_minion %} {%- for configname in cfg_minion|sort %}
{%- if configname not in reserved_keys and configname not in default_keys %} {%- if configname not in reserved_keys and configname not in default_keys %}
{%- if cfg_minion[configname] is iterable and cfg_minion[configname] is not mapping and cfg_minion[configname] is not string %} {%- if cfg_minion[configname] is iterable and cfg_minion[configname] is not mapping and cfg_minion[configname] is not string %}
{{ configname }}: {{ configname }}: