Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make the configuration of engines specific to master or minion #259

Merged
merged 3 commits into from
Nov 9, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions salt/files/master.d/engine.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# This file is managed by Salt! Do not edit by hand!
#
{%- set engines = salt['pillar.get']('salt:engines') -%}
{%- set engines = salt['pillar.get']('salt:master:engines', default=engines, merge=True) -%}
{%- if engines %}
engines:
{{ engines | yaml(False) | indent(2) }}
Expand Down
2 changes: 1 addition & 1 deletion salt/files/master.d/f_defaults.conf
Original file line number Diff line number Diff line change
@@ -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) -%}
Expand Down
1 change: 1 addition & 0 deletions salt/files/minion.d/engine.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# This file is managed by Salt! Do not edit by hand!
#
{%- set engines = salt['pillar.get']('salt:engines') -%}
{%- set engines = salt['pillar.get']('salt:minion:engines', default=engines, merge=True) -%}
{%- if engines %}
engines:
{{ engines | yaml(False) | indent(2) }}
Expand Down
4 changes: 2 additions & 2 deletions salt/files/minion.d/f_defaults.conf
Original file line number Diff line number Diff line change
@@ -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 = [] -%}
Expand Down Expand Up @@ -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 %}
{%- endfor %}