Browse Source

Add 'return' to reserved_keys in minion config

This prevents the `return` key being duplicated in the minion config by L1205
tags/v0.58.4
Ryan Walder 5 years ago
parent
commit
042e9baad3
No account linked to committer's email address
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      salt/files/minion.d/f_defaults.conf

+ 1
- 1
salt/files/minion.d/f_defaults.conf View File

# 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 = [] -%}

Loading…
Cancel
Save