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

Fix the handling of event_return_whitelist/event_return_blacklist 

If those options are set in pillar data, the jinja template
salt/files/master.d/_defaults.conf would fail to compile trying to
evaluate non-existing variables.

Replace those variables with the corresponding dictionnary entries.
This commit is contained in:
Raphaël Hertzog 2014-12-24 16:25:51 +01:00
parent d4ae38f825
commit 7fb86b9076
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/files/master.d/_defaults.conf
View File

@ -150,12 +150,12 @@
# Only events returns matching tags in a whitelist
{% if 'event_return_whitelist' in cfg_master -%}
event_return_whitelist:
{%- for event_return in event_return_whitelist %}
{%- for event_return in cfg_master['event_return_whitelist'] %}
- {{ event_return }}
{%- endfor -%}
{% elif 'event_return_whitelist' in cfg_salt -%}
event_return_whitelist:
{%- for event_return in event_return_whitelist %}
{%- for event_return in cfg_salt['event_return_whitelist'] %}
- {{ event_return }}
{%- endfor -%}
{% else -%}
@ -167,12 +167,12 @@ event_return_whitelist:
# Store all event returns _except_ the tags in a blacklist
{% if 'event_return_blacklist' in cfg_master -%}
event_return_blacklist:
{%- for event_return in event_return_blacklist %}
{%- for event_return in cfg_master['event_return_blacklist'] %}
- {{ event_return }}
{%- endfor -%}
{% elif 'event_return_blacklist' in cfg_salt -%}
event_return_blacklist:
{%- for event_return in event_return_blacklist %}
{%- for event_return in cfg_salt['event_return_blacklist'] %}
- {{ event_return }}
{%- endfor -%}
{% else -%}