Merge pull request #357 from Zero-Down-Time/master
Add profile support to engine.conf to support sqs_events, bugfix for pillar defaults
This commit is contained in:
commit
fd96c7a65a
@ -1,8 +1,13 @@
|
|||||||
#
|
#
|
||||||
# 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) -%}
|
{%- set engines = salt['pillar.get']('salt:master:engines', default=engines, merge=True) -%}
|
||||||
|
{%- set engines_profiles = salt['pillar.get']('salt:engines_profiles', {}) -%}
|
||||||
|
{%- set engines_profiles = salt['pillar.get']('salt:master:engines_profiles', default=engines_profiles, merge=True) -%}
|
||||||
|
{%- if engines_profiles %}
|
||||||
|
{{ engines_profiles | yaml(False) }}
|
||||||
|
{%- endif -%}
|
||||||
{%- if engines %}
|
{%- if engines %}
|
||||||
engines:
|
engines:
|
||||||
{{ engines | yaml(False) | indent(2) }}
|
{{ engines | yaml(False) | indent(2) }}
|
||||||
|
Loading…
Reference in New Issue
Block a user