saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

Merge pull request #259 from kakwa/separate_engines_config

Browse Source 
make the configuration of engines specific to master or minion
This commit is contained in:
Forrest 2016-11-09 12:08:33 -08:00 committed by GitHub
commit 01043740dc
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
salt/files/master.d/engine.conf
View File

@ -2,6 +2,7 @@
# This file is managed by Salt! Do not edit by hand! # This file is managed by Salt! Do not edit by hand!
# #
{%- set engines = salt['pillar.get']('salt:engines') -%} {%- set engines = salt['pillar.get']('salt:engines') -%}
{%- set engines = salt['pillar.get']('salt:master:engines', default=engines, merge=True) -%}
{%- if engines %} {%- if engines %}
engines: engines:
{{ engines | yaml(False) | indent(2) }} {{ engines | yaml(False) | indent(2) }}

2
salt/files/master.d/f_defaults.conf
View File

@ -1,6 +1,6 @@
# 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) -%}

1
salt/files/minion.d/engine.conf
View File

@ -2,6 +2,7 @@
# This file is managed by Salt! Do not edit by hand! # This file is managed by Salt! Do not edit by hand!
# #
{%- set engines = salt['pillar.get']('salt:engines') -%} {%- set engines = salt['pillar.get']('salt:engines') -%}
{%- set engines = salt['pillar.get']('salt:minion:engines', default=engines, merge=True) -%}
{%- if engines %} {%- if engines %}
engines: engines:
{{ engines | yaml(False) | indent(2) }} {{ engines | yaml(False) | indent(2) }}

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

@ -1,7 +1,7 @@
# 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 = [] -%}