Merge pull request #251 from UGNS/master

Clean-up master.d/f_defaults.conf and add winrepo_provider

pillar.example

@@ -74,6 +74,11 @@ salt:
       # filter to use for Most other LDAP servers
     auth.ldap.filter: {% raw %}'uid={{ username }}'{% endraw %}
 
+    # Define winrepo provider, by default support order is pygit2, gitpython
+    # Set to gitpython for Debian & Ubuntu to get around saltstack/salt#35993
+    # where pygit2 is not compiled with pygit2.GIT_FEATURE_HTTPS support
+    winrepo_provider: gitpython
+
     # optional engine configuration
     engines:
       slack:

salt/files/master.d/f_defaults.conf

@@ -1282,17 +1282,17 @@ log_granular_levels:
 #nodegroups:
 #  group1: 'L@foo.domain.com,bar.domain.com,baz.domain.com and bl*.domain.com'
 #  group2: 'G@os:Debian and foo.domain.com'
-{% if 'nodegroups' in cfg_master %}
+{%- if 'nodegroups' in cfg_master %}
 nodegroups:
-  {% for name, lvl in cfg_master['nodegroups'].items() %}
+  {%- for name, lvl in cfg_master['nodegroups'].items() %}
   {{ name }}: {{ lvl }}
-  {% endfor %}
-{% elif 'nodegroups' in cfg_salt %}
+  {%- endfor %}
+{%- elif 'nodegroups' in cfg_salt %}
 nodegroups:
-  {% for name, lvl in cfg_salt['nodegroups'].items() %}
+  {%- for name, lvl in cfg_salt['nodegroups'].items() %}
   {{ name }}: {{ lvl }}
-  {% endfor %}
-{% endif %}
+  {%- endfor %}
+{%- endif %}
 
 #####     Range Cluster settings     #####
 ##########################################
@@ -1304,6 +1304,12 @@ nodegroups:
 
 #####  Windows Software Repo settings #####
 ###########################################
+# Specify the provider to be used for git_pillar. Must be either pygit2 or
+# gitpython. If unset, then both will be tried in that same order, and the
+# first one with a compatible version installed will be the provider that
+# is used.
+{{ get_config('winrepo_provider', 'pygit2') }}
+
 # Repo settings for 2015.8+ master used with 2015.8+ Windows minions
 #
 # Location of the repo on the master:
@@ -1441,4 +1447,4 @@ mongo.{{ name }}: {{ value }}
 alternative.mongo.{{ name }}: {{ value }}
 {%- endfor %}
 {% endif %}
-{%- endif %}
+{%- endif %}