Browse Source

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

Allow individual repo options for gitfs_remotes
master
Nitin Madhok 10 years ago
parent
commit
3e4d9d012b
2 changed files with 14 additions and 1 deletions
  1. +1
    -0
      pillar.example
  2. +13
    -1
      salt/files/master.d/_defaults.conf

+ 1
- 0
pillar.example View File

- 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

+ 13
- 1
salt/files/master.d/_defaults.conf View File

{% 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:

Loading…
Cancel
Save