saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

Merge pull request #37 from z-saltstack/fixed_file_roots

Browse Source 
Fixed file_roots config generation with several environment
This commit is contained in:
Seth House 2014-05-10 12:26:57 -06:00
commit 23ef33b675
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
salt/files/master
View File

@ -343,20 +343,20 @@ client_acl_blacklist:
# - /srv/salt/prod/states
{% if 'file_roots' in master -%}
file_roots:
{% for name, roots in master['file_roots'].items() -%}
{%- for name, roots in master['file_roots']|dictsort %}
{{ name }}:
{% for dir in roots -%}
- {{ dir }}
{% endfor -%}
{% endfor -%}
{%- for dir in roots %}
- {{ dir }}
{%- endfor -%}
{%- endfor -%}
{% elif 'file_roots' in salt -%}
file_roots:
{% for name, roots in salt['file_roots'].items() -%}
{%- for name, roots in salt['file_roots']|dictsort %}
{{ name }}:
{% for dir in roots -%}
- {{ dir }}
{% endfor -%}
{% endfor -%}
{%- for dir in roots %}
- {{ dir }}
{%- endfor -%}
{%- endfor -%}
{% else -%}
#file_roots:
# base:
@ -513,20 +513,20 @@ gitfs_remotes:
# highstate format, and is generally just key/value pairs.
{% if 'pillar_roots' in master -%}
pillar_roots:
{% for name, roots in master['pillar_roots'].items() -%}
{%- for name, roots in master['pillar_roots']|dictsort %}
{{ name }}:
{% for dir in roots -%}
- {{ dir }}
{% endfor -%}
{% endfor -%}
{%- for dir in roots %}
- {{ dir }}
{%- endfor -%}
{%- endfor -%}
{% elif 'pillar_roots' in salt -%}
pillar_roots:
{% for name, roots in salt['pillar_roots'].items() -%}
{%- for name, roots in salt['pillar_roots'].items() -%}
{{ name }}:
{% for dir in roots -%}
- {{ dir }}
{% endfor -%}
{% endfor -%}
{%- for dir in roots -%}
- {{ dir }}
{%- endfor -%}
{%- endfor -%}
{% else %}
#pillar_roots:
# base: