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

fixed ext_pillar

This commit is contained in:
Kenneth Wilke 2013-08-27 10:20:42 -05:00
parent c080cf37d6
commit 426493b76d
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
View File

@ -435,13 +435,13 @@ pillar_roots:
{% if 'ext_pillar' in master -%}
ext_pillar:
{% for name, args in master['ext_pillar'].items() -%}
- {{ name }}: {{ args }}
{% for pillar in master['ext_pillar'] %}
- {{ pillar }}
{% endfor -%}
{% elif 'ext_pillar' in salt -%}
ext_pillar:
{% for name, args in salt['ext_pillar'].items() -%}
- {{ name }}: {{ args }}
{% for pillar in salt['ext_pillar'] %}
- {{ pillar }}
{% endfor -%}
{% else %}
# ext_pillar: