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

Allow individual repo options for gitfs_remotes
saltstack-formulas · Oct 24, 2014 · 3e4d9d0 · 3e4d9d0
2 parents 2013d4b + 9dab2f9
commit 3e4d9d0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/pillar.example b/pillar.example
@@ -5,6 +5,7 @@ salt:
       - roots
     gitfs_remotes:
       - git://github.com/saltstack-formulas/salt-formula.git
+        - base: develop
     file_roots:
       base:
         - /srv/salt

diff --git a/salt/files/master.d/_defaults.conf b/salt/files/master.d/_defaults.conf
@@ -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: