Skip to content

Commit

Permalink
Add 'return' to reserved_keys in minion config
Browse files Browse the repository at this point in the history
This prevents the `return` key being duplicated in the minion config by L1205
  • Loading branch information
ryanwalder authored Aug 15, 2019
1 parent 4faaf75 commit 042e9ba
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion salt/files/minion.d/f_defaults.conf
Original file line number Diff line number Diff line change
@@ -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 = [] -%}
Expand Down

0 comments on commit 042e9ba

Please sign in to comment.