From 2b51a6f0c39b4df56823afe9d114dab886e3359e Mon Sep 17 00:00:00 2001
From: Ajna Cackovic <cackovic@users.noreply.github.com>
Date: Thu, 23 Oct 2014 17:39:21 -0700
Subject: [PATCH 1/2] Allow repo options to be set per repo for gitfs_remotes
in pillar
---
salt/files/master.d/_defaults.conf | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/salt/files/master.d/_defaults.conf b/salt/files/master.d/_defaults.conf
index d1b97e1..b08292e 100644
--- 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:
From 9dab2f9dab1b5bb1bc517ae8af3c4582746d4fcc Mon Sep 17 00:00:00 2001
From: Ajna Cackovic <cackovic@users.noreply.github.com>
Date: Thu, 23 Oct 2014 17:43:23 -0700
Subject: [PATCH 2/2] Update pillar.example to show gitfs_remotes option usage
---
pillar.example | 1 +
1 file changed, 1 insertion(+)
diff --git a/pillar.example b/pillar.example
index e05dd74..610ffb0 100644
--- 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