fix: sort extra options in configuration

Ensure extra options in generated configuration is sorted, to ensure stable configuration.
saltstack-formulas · Oct 28, 2021 · 89cdcec · 89cdcec
1 parent 99b1469
commit 89cdcec
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf
@@ -1821,7 +1821,7 @@ alternative.mongo.{{ name }}: {{ value }}
 {% 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 %}
 {{ configname }}:
   {{ cfg_master[configname]| yaml(False) | indent(2) }}

diff --git a/salt/files/minion.d/f_defaults.conf b/salt/files/minion.d/f_defaults.conf
@@ -1251,7 +1251,7 @@ alternative.mongo.{{ name }}: {{ value }}
 {% 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 cfg_minion[configname] is iterable and cfg_minion[configname] is not mapping and cfg_minion[configname] is not string %}
 {{ configname }}: