From ef120e56bc25aee006d2f0a6baf9d6791d2af731 Mon Sep 17 00:00:00 2001 From: risca Date: Thu, 23 Feb 2017 23:51:14 +0100 Subject: [PATCH] fixed key reserved for lxc_profile file --- salt/files/master.d/f_defaults.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf index b97bf57..39c0ad3 100644 --- a/salt/files/master.d/f_defaults.conf +++ b/salt/files/master.d/f_defaults.conf @@ -1,6 +1,6 @@ # This file managed by Salt, do not edit by hand!! # 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_master = cfg_salt.get('master', {}) -%} {% set default_keys = [] -%}