Merge pull request #430 from saltstack-formulas/ryanwalder-patch-1

aboe76 · web-flow · commit 5778238244eb · 2019-08-17T11:12:13.000+02:00
fix(minion): Add 'return' to reserved_keys in minion config
diff --git a/salt/files/minion.d/f_defaults.conf b/salt/files/minion.d/f_defaults.conf
@@ -1,7 +1,7 @@
 # This file managed by Salt, do not edit by hand!!
 #  Based on salt version 2016.11 default config
 #
-{% set reserved_keys = ['master', 'minion', 'cloud', 'salt_cloud_certs', 'engines', 'beacons', 'reactors'] -%}
+{% set reserved_keys = ['master', 'minion', 'cloud', 'salt_cloud_certs', 'engines', 'beacons', 'reactors', 'return'] -%}
 {% set cfg_salt = pillar.get('salt', {}) -%}
 {% set cfg_minion = cfg_salt.get('minion', {}) -%}
 {% set default_keys = [] -%}

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`# This file managed by Salt, do not edit by hand!!`
`2`	`2`	`# Based on salt version 2016.11 default config`
`3`	`3`	`#`
`4`		`-{% set reserved_keys = ['master', 'minion', 'cloud', 'salt_cloud_certs', 'engines', 'beacons', 'reactors'] -%}`
	`4`	`+{% set reserved_keys = ['master', 'minion', 'cloud', 'salt_cloud_certs', 'engines', 'beacons', 'reactors', 'return'] -%}`
`5`	`5`	`{% set cfg_salt = pillar.get('salt', {}) -%}`
`6`	`6`	`{% set cfg_minion = cfg_salt.get('minion', {}) -%}`
`7`	`7`	`{% set default_keys = [] -%}`