Quellcode durchsuchen

Merge pull request #297 from Sjd-Risca/fix_lxc_keyword

fixed key reserved for lxc_profile file
tags/v0.57.0
Niels Abspoel vor 7 Jahren
Ursprung
Commit
d34f63fdf0
1 geänderte Dateien mit 1 neuen und 1 gelöschten Zeilen
  1. +1
    -1
      salt/files/master.d/f_defaults.conf

+ 1
- 1
salt/files/master.d/f_defaults.conf Datei anzeigen

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

Laden…
Abbrechen
Speichern