Johannes
10 years ago
2 changed files with 4 additions and 2 deletions
+ 2
- 1
salt/files/master
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 0.17.4 default config | # Based on salt version 0.17.4 default config | ||||
| {% set reserved_keys = ['master', 'minion', 'cloud', 'salt_cloud_certs'] -%} | |||||
| {% set salt = pillar.get('salt', {}) -%} | {% set salt = pillar.get('salt', {}) -%} | ||||
| {% set master = salt.get('master', {}) -%} | {% set master = salt.get('master', {}) -%} | ||||
| {%- macro get_config(configname, default_value) -%} | {%- macro get_config(configname, default_value) -%} | ||||
| {%- if configname in master -%} | {%- if configname in master -%} | ||||
| {{ configname }}: {{ master[configname] }} | {{ configname }}: {{ master[configname] }} | ||||
| {%- elif configname in salt -%} | |||||
| {%- elif configname in salt and configname not in reserved_keys -%} | |||||
| {{ configname }}: {{ salt[configname] }} | {{ configname }}: {{ salt[configname] }} | ||||
| {%- else -%} | {%- else -%} | ||||
| #{{ configname }}: {{ default_value }} | #{{ configname }}: {{ default_value }} |
+ 2
- 1
salt/files/minion
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 0.17.4 default config | # Based on salt version 0.17.4 default config | ||||
| {% set reserved_keys = ['master', 'minion', 'cloud', 'salt_cloud_certs'] -%} | |||||
| {% set salt = pillar.get('salt', {}) -%} | {% set salt = pillar.get('salt', {}) -%} | ||||
| {% set minion = salt.get('minion', {}) -%} | {% set minion = salt.get('minion', {}) -%} | ||||
| {%- macro get_config(configname, default_value) -%} | {%- macro get_config(configname, default_value) -%} | ||||
| {%- if configname in minion -%} | {%- if configname in minion -%} | ||||
| {{ configname }}: {{ minion[configname] }} | {{ configname }}: {{ minion[configname] }} | ||||
| {%- elif configname in salt -%} | |||||
| {%- elif configname in salt and configname not in reserved_keys -%} | |||||
| {{ configname }}: {{ salt[configname] }} | {{ configname }}: {{ salt[configname] }} | ||||
| {%- else -%} | {%- else -%} | ||||
| #{{ configname }}: {{ default_value }} | #{{ configname }}: {{ default_value }} |
Loading…