瀏覽代碼

Merge pull request #297 from Sjd-Risca/fix_lxc_keyword

fixed key reserved for lxc_profile file
tags/v0.57.0
Niels Abspoel 7 年之前
父節點
當前提交
d34f63fdf0
共有 1 個檔案被更改,包括 1 行新增1 行删除
  1. +1
    -1
      salt/files/master.d/f_defaults.conf

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

Loading…
取消
儲存