From 334d5de72b3bb5aa380a9706a7bed0f6f21dbcb2 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Mon, 29 Jan 2018 12:28:48 -0800 Subject: [PATCH 1/2] Support profiles within engine.conf to be able to configure sqs_events, https://docs.saltstack.com/en/latest/ref/engines/all/salt.engines.sqs_events.html --- salt/files/master.d/engine.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/salt/files/master.d/engine.conf b/salt/files/master.d/engine.conf index 47e6a6d..e0078bf 100644 --- a/salt/files/master.d/engine.conf +++ b/salt/files/master.d/engine.conf @@ -3,6 +3,11 @@ # {%- set engines = salt['pillar.get']('salt:engines', {}) -%} {%- 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 %} engines: {{ engines | yaml(False) | indent(2) }} From e92f6f80b0f3b1c6d994bb6593389d053bf36ccd Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Tue, 30 Jan 2018 12:57:31 -0800 Subject: [PATCH 2/2] Fix default value to match array type of pillar --- salt/files/master.d/engine.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/files/master.d/engine.conf b/salt/files/master.d/engine.conf index e0078bf..deae50d 100644 --- a/salt/files/master.d/engine.conf +++ b/salt/files/master.d/engine.conf @@ -1,7 +1,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:engines', []) -%} {%- 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) -%}