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

ext_pillar fix

This commit is contained in:
Kenneth Wilke 2013-08-23 12:01:36 -05:00
parent e83d25b80f
commit c080cf37d6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/files/master
View File

@ -403,6 +403,7 @@ gitfs_remotes:
- {{ remote }}{% endfor -%} - {{ remote }}{% endfor -%}
{%- endif %} {%- endif %}
##### Pillar settings ##### ##### Pillar settings #####
########################################## ##########################################
# Salt Pillars allow for the building of global data that can be made selectively # Salt Pillars allow for the building of global data that can be made selectively
@ -437,7 +438,7 @@ ext_pillar:
{% for name, args in master['ext_pillar'].items() -%} {% for name, args in master['ext_pillar'].items() -%}
- {{ name }}: {{ args }} - {{ name }}: {{ args }}
{% endfor -%} {% endfor -%}
{% elif 'pillar_roots' in salt -%} {% elif 'ext_pillar' in salt -%}
ext_pillar: ext_pillar:
{% for name, args in salt['ext_pillar'].items() -%} {% for name, args in salt['ext_pillar'].items() -%}
- {{ name }}: {{ args }} - {{ name }}: {{ args }}