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

Merge pull request #55 from OneID/feature/gitfs-repo-options

Browse Source 
Allow individual repo options for gitfs_remotes
This commit is contained in:
Nitin Madhok 2014-10-23 23:32:14 -07:00
commit 3e4d9d012b
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pillar.example
View File

@ -5,6 +5,7 @@ salt:
- roots - roots
gitfs_remotes: gitfs_remotes:
- git://github.com/saltstack-formulas/salt-formula.git - git://github.com/saltstack-formulas/salt-formula.git
- base: develop
file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt

14
salt/files/master.d/_defaults.conf
View File

@ -484,7 +484,19 @@ fileserver_backend:
{% if 'gitfs_remotes' in master -%} {% if 'gitfs_remotes' in master -%}
gitfs_remotes: gitfs_remotes:
{%- for remote in master['gitfs_remotes'] %} {%- for remote in master['gitfs_remotes'] %}
- {{ remote }}{% endfor -%} {% if remote is mapping %}
{%- for repo, children in remote.iteritems() -%}
- {{ repo }}:
{%- for child in children %}
{% for key, value in child.iteritems() -%}
- {{ key }}: {{ value }}
{%- endfor %}
{%- endfor %}
{%- endfor %}
{%- else -%}
- {{ remote }}
{%- endif %}
{%- endfor %}
{%- endif %} {%- endif %}
# #
#gitfs_remotes: #gitfs_remotes: