2
0

Add 'return' to reserved_keys in minion config

This prevents the `return` key being duplicated in the minion config by L1205
This commit is contained in:
Ryan Walder 2019-08-15 14:16:57 +01:00 committed by GitHub
parent 4faaf7529f
commit 042e9baad3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,7 +1,7 @@
# This file managed by Salt, do not edit by hand!! # This file managed by Salt, do not edit by hand!!
# Based on salt version 2016.11 default config # 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_salt = pillar.get('salt', {}) -%}
{% set cfg_minion = cfg_salt.get('minion', {}) -%} {% set cfg_minion = cfg_salt.get('minion', {}) -%}
{% set default_keys = [] -%} {% set default_keys = [] -%}