Javier Bértoli
7 years ago
2 changed files with 2 additions and 2 deletions
+ 1
- 1
salt/files/master.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', 'lxc.network_profile', 'lxc.container_profile'] -%} | |||||
| {% set reserved_keys = ['master', 'minion', 'cloud', 'salt_cloud_certs', 'engines', 'lxc.network_profile', 'lxc.container_profile', 'reactors'] -%} | |||||
| {% set cfg_salt = pillar.get('salt', {}) -%} | {% set cfg_salt = pillar.get('salt', {}) -%} | ||||
| {% set cfg_master = cfg_salt.get('master', {}) -%} | {% set cfg_master = cfg_salt.get('master', {}) -%} | ||||
| {% set default_keys = [] -%} | {% set default_keys = [] -%} |
+ 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'] -%} | |||||
| {% set reserved_keys = ['master', 'minion', 'cloud', 'salt_cloud_certs', 'engines', 'beacons', 'reactors'] -%} | |||||
| {% 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…