diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf index 6550c56..c613ee7 100644 --- a/salt/files/master.d/f_defaults.conf +++ b/salt/files/master.d/f_defaults.conf @@ -1,6 +1,6 @@ # This file managed by Salt, do not edit by hand!! # Based on salt version 2015.8.7 default config -{% set reserved_keys = ['master', 'minion', 'cloud', 'salt_cloud_certs'] -%} +{% set reserved_keys = ['master', 'minion', 'cloud', 'salt_cloud_certs', 'engines'] -%} {% set cfg_salt = pillar.get('salt', {}) -%} {% set cfg_master = cfg_salt.get('master', {}) -%} {%- macro get_config(configname, default_value) -%} diff --git a/salt/files/minion.d/f_defaults.conf b/salt/files/minion.d/f_defaults.conf index 4178d42..c6629f0 100644 --- a/salt/files/minion.d/f_defaults.conf +++ b/salt/files/minion.d/f_defaults.conf @@ -1,7 +1,7 @@ # This file managed by Salt, do not edit by hand!! # Based on salt version 2015.8.7 default config # -{% set reserved_keys = ['master', 'minion', 'cloud', 'salt_cloud_certs'] -%} +{% set reserved_keys = ['master', 'minion', 'cloud', 'salt_cloud_certs', 'engines'] -%} {% set cfg_salt = pillar.get('salt', {}) -%} {% set cfg_minion = cfg_salt.get('minion', {}) -%} {% set default_keys = [] -%} @@ -1025,4 +1025,4 @@ alternative.mongo.{{ name }}: {{ value }} {%- if configname not in reserved_keys and configname not in default_keys %} {{ configname }}: {{ cfg_minion[configname]|json }} {%- endif %} -{%- endfor %} \ No newline at end of file +{%- endfor %}