Salt/salt-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2024-11-30 21:45:25 +01:00
Code Issues Activity

ext_pillar fix

Browse Source
This commit is contained in:
Kenneth Wilke 2013-08-27 10:33:06 -05:00
parent 1f71bef33b
commit e3a29bf69a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/files/master
View File

@ -436,12 +436,12 @@ pillar_roots:
{% if 'ext_pillar' in master -%} {% if 'ext_pillar' in master -%}
ext_pillar: ext_pillar:
{% for pillar in master['ext_pillar'] %} {% for pillar in master['ext_pillar'] %}
- {{ pillar.items()[0] }}: {{ pillar.items()[1] }} - {{ pillar.items()[0][0] }}: {{ pillar.items()[0][1] }}
{% endfor -%} {% endfor -%}
{% elif 'ext_pillar' in salt -%} {% elif 'ext_pillar' in salt -%}
ext_pillar: ext_pillar:
{% for pillar in salt['ext_pillar'] %} {% for pillar in salt['ext_pillar'] %}
- {{ pillar.items()[0] }}: {{ pillar.items()[1] }} - {{ pillar.items()[0][0] }}: {{ pillar.items()[0][1] }}
{% endfor -%} {% endfor -%}
{% else %} {% else %}
# ext_pillar: # ext_pillar: