Browse Source

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

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.
tags/v0.57.0
Raphaël Hertzog 8 years ago
parent
commit
182098fc16
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      salt/files/master.d/f_defaults.conf

+ 3
- 3
salt/files/master.d/f_defaults.conf View File

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

Loading…
Cancel
Save