浏览代码

fix: sort extra options in configuration

Ensure extra options in generated configuration is sorted, to ensure stable
configuration.
tags/v1.9.9
Adrien "ze" Urban 3 年前
父节点
当前提交
89cdcec595
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. +1
    -1
      salt/files/master.d/f_defaults.conf
  2. +1
    -1
      salt/files/minion.d/f_defaults.conf

+ 1
- 1
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) }}

+ 1
- 1
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 }}:

正在加载...
取消
保存