Salt/salt-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2025-02-20 10:28:45 +01:00
Code Issues Activity

Merge pull request #168 from saltstack-formulas/fix_master_pillar_root

Browse Source 
Fixed pillar_roots generation for salt-master.
This commit is contained in:
Nitin Madhok 2015-08-06 05:43:08 -04:00
commit 03464977dc
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/f_defaults.conf
View File

@ -652,12 +652,12 @@ pillar_roots:
{%- for dir in roots %} {%- for dir in roots %}
- {{ dir }} - {{ dir }}
{%- endfor -%} {%- endfor -%}
{% endfor %} {%- endfor -%}
{%- elif 'pillar_roots' in cfg_salt -%} {% elif 'pillar_roots' in cfg_salt -%}
pillar_roots: pillar_roots:
{%- for name, roots in cfg_salt['pillar_roots']|dictsort -%} {%- for name, roots in cfg_salt['pillar_roots']|dictsort %}
{{ name }}: {{ name }}:
{%- for dir in roots -%} {%- for dir in roots %}
- {{ dir }} - {{ dir }}
{%- endfor -%} {%- endfor -%}
{%- endfor -%} {%- endfor -%}