saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

Merge pull request #297 from Sjd-Risca/fix_lxc_keyword

Browse Source 
fixed key reserved for lxc_profile file
This commit is contained in:
Niels Abspoel 2017-02-24 00:03:04 +01:00 committed by GitHub
commit d34f63fdf0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/files/master.d/f_defaults.conf
View File

@ -1,6 +1,6 @@
# This file managed by Salt, do not edit by hand!! # This file managed by Salt, do not edit by hand!!
# Based on salt version 2015.8.7 default config # Based on salt version 2015.8.7 default config
{% set reserved_keys = ['master', 'minion', 'cloud', 'salt_cloud_certs', 'engines'] -%} {% set reserved_keys = ['master', 'minion', 'cloud', 'salt_cloud_certs', 'engines', 'lxc.network_profile', 'lxc.container_profile'] -%}
{% 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 = [] -%}