saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

JSON encode values embedded in the salt-master's configuration file

Browse Source 
This avoids problems when values are strings containing colons. And it
mimicks what was already done for the salt-minion's configuration file.

Fixes #233.
This commit is contained in:
Raphaël Hertzog 2016-06-20 22:24:20 +02:00
parent a96f7093fb
commit 182098fc16
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 -%}