Salt
/
salt-formula
mirror of https://github.com/saltstack-formulas/salt-formula.git
0
0
Fork 0
Code Issues Activity

Merge pull request #235 from rhertzog/master-config-fix 

JSON encode values embedded in the salt-master's configuration file
This commit is contained in:
Forrest 2016-06-20 14:11:46 -07:00 committed by GitHub
parent a96f7093fb 182098fc16
commit 6b96bda5cd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,11 +5,11 @@
{% set cfg_master = cfg_salt.get('master', {}) -%}
{%- macro get_config(configname, default_value) -%}
{%- if configname in cfg_master -%}
{{ configname }}: {{ cfg_master[configname] }}
{{ configname }}: {{ cfg_master[configname]|json }}
{%- elif configname in cfg_salt and configname not in reserved_keys -%}
{{ configname }}: {{ cfg_salt[configname] }}
{{ configname }}: {{ cfg_salt[configname]|json }}
{%- else -%}
#{{ configname }}: {{ default_value }}
#{{ configname }}: {{ default_value|json }}
{%- endif -%}
{%- endmacro -%}
{%- from 'salt/formulas.jinja' import file_roots, formulas with context -%}