Skip to content

Commit 042e9ba

Browse files
authored
Add 'return' to reserved_keys in minion config
This prevents the `return` key being duplicated in the minion config by L1205
1 parent 4faaf75 commit 042e9ba

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

salt/files/minion.d/f_defaults.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This file managed by Salt, do not edit by hand!!
22
# Based on salt version 2016.11 default config
33
#
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'] -%}
55
{% set cfg_salt = pillar.get('salt', {}) -%}
66
{% set cfg_minion = cfg_salt.get('minion', {}) -%}
77
{% set default_keys = [] -%}

0 commit comments

Comments
 (0)