Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow individual repo options for gitfs_remotes #55

Merged
merged 2 commits into from Oct 24, 2014
Merged

Allow individual repo options for gitfs_remotes #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b51a6f
Allow repo options to be set per repo for gitfs_remotes in pillar
cackovic Oct 24, 2014
9dab2f9
Update pillar.example to show gitfs_remotes option usage
cackovic Oct 24, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pillar.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ salt:
- roots
gitfs_remotes:
- git://github.com/saltstack-formulas/salt-formula.git
- base: develop
file_roots:
base:
- /srv/salt
Expand Down
14 changes: 13 additions & 1 deletion salt/files/master.d/_defaults.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,19 @@ fileserver_backend:
{% if 'gitfs_remotes' 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 %}
#
#gitfs_remotes:
Expand Down