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

Merge pull request #16 from KennethWilke/master

Browse Source 
master config fixes
This commit is contained in:
Seth House 2013-08-27 11:11:01 -07:00
commit fbda93c5e4
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
salt/files/master
View File

@ -379,8 +379,12 @@ file_ignore_glob:
# fileserver_backend: # fileserver_backend:
# - git # - git
# - roots # - roots
{{ get_config('fileserver_backend', '[]') }} {% if 'fileserver_backend' in master -%}
fileserver_backend:
{%- for backend in master['fileserver_backend'] %}
- {{ backend }}
{% endfor -%}
{% endif %}
# Git fileserver backend configuration # Git fileserver backend configuration
# When using the git fileserver backend at least one git remote needs to be # When using the git fileserver backend at least one git remote needs to be
# defined. The user running the salt master will need read access to the repo. # defined. The user running the salt master will need read access to the repo.
@ -393,7 +397,11 @@ file_ignore_glob:
# environments. # environments.
# Note: file:// repos will be treated as a remote, so refs you want used must # Note: file:// repos will be treated as a remote, so refs you want used must
# exist in that repo as *local* refs. # exist in that repo as *local* refs.
{{ get_config('gitfs_remotes', '[]') }} {% if 'gitfs_remotes' in master -%}
gitfs_remotes:
{%- for remote in master['gitfs_remotes'] %}
- {{ remote }}{% endfor -%}
{%- endif %}
##### Pillar settings ##### ##### Pillar settings #####
@ -427,13 +435,13 @@ pillar_roots:
{% if 'ext_pillar' in master -%} {% if 'ext_pillar' in master -%}
ext_pillar: ext_pillar:
{% for name, args in master['ext_pillar'].items() -%} {% for pillar in master['ext_pillar'] %}
- {{ name }}: {{ args }} - {{ pillar.items()[0][0] }}: {{ pillar.items()[0][1] }}
{% 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 pillar in salt['ext_pillar'] %}
- {{ name }}: {{ args }} - {{ pillar.items()[0][0] }}: {{ pillar.items()[0][1] }}
{% endfor -%} {% endfor -%}
{% else %} {% else %}
# ext_pillar: # ext_pillar: