Browse Source

add engines as a reserved_keys to not add generic configuration

tags/v0.57.0
carpenti 8 years ago
parent
commit
3098aebcad
2 changed files with 3 additions and 3 deletions
  1. +1
    -1
      salt/files/master.d/f_defaults.conf
  2. +2
    -2
      salt/files/minion.d/f_defaults.conf

+ 1
- 1
salt/files/master.d/f_defaults.conf View File

# This file managed by Salt, do not edit by hand!! # This file managed by Salt, do not edit by hand!!
# Based on salt version 2015.8.7 default config # 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_salt = pillar.get('salt', {}) -%}
{% set cfg_master = cfg_salt.get('master', {}) -%} {% set cfg_master = cfg_salt.get('master', {}) -%}
{%- macro get_config(configname, default_value) -%} {%- macro get_config(configname, default_value) -%}

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

# This file managed by Salt, do not edit by hand!! # This file managed by Salt, do not edit by hand!!
# Based on salt version 2015.8.7 default config # 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_salt = pillar.get('salt', {}) -%}
{% set cfg_minion = cfg_salt.get('minion', {}) -%} {% set cfg_minion = cfg_salt.get('minion', {}) -%}
{% set default_keys = [] -%} {% set default_keys = [] -%}
{%- 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_minion[configname]|json }} {{ configname }}: {{ cfg_minion[configname]|json }}
{%- endif %} {%- endif %}
{%- endfor %}
{%- endfor %}

Loading…
Cancel
Save