fix(windows): git.latest(parallel:true) does not work

saltstack-formulas · Sep 11, 2020 · 0c591bb · 0c591bb
1 parent a36f2eb
commit 0c591bb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/salt/defaults.yaml b/salt/defaults.yaml
@@ -11,6 +11,7 @@ salt:
   use_pip: false
   clean_config_d_dir: true
   restart_via_at: false
+  parallel: true   # salt.git module argument
 
   config_path: /etc/salt
 

diff --git a/salt/formulas.sls b/salt/formulas.sls
@@ -34,7 +34,7 @@
 {%-       do processed_basedirs.append(basedir) %}
 {{ basedir }}:
   file.directory:
-    - parallel: {{ grains['saltversioninfo'] >= [2017, 7, 0] }}
+    - parallel: {{ salt_settings.parallel }}
     {%-   for key, value in salt['pillar.get']('salt_formulas:basedir_opts',
                                                {'makedirs': True}).items() %}
     - {{ key }}: {{ value }}
@@ -54,7 +54,7 @@
 {{ gitdir_env }}:
   git.latest:
     - name: {{ baseurl }}/{{ f_name }}.git
-    - parallel: {{ grains['saltversioninfo'] >= [2017, 7, 0] }}
+    - parallel: {{ salt_settings.parallel }}
     - target: {{ gitdir }}
     {%-   for key, value in options.items() %}
     - {{ key }}: {{ value }}

diff --git a/salt/osmap.yaml b/salt/osmap.yaml
@@ -61,3 +61,6 @@ MacOS:
   master_service: com.saltstack.salt.master
   salt_master_macos_plist_hash: 8435331b2d48ca8f0759f216e5b15ec9171a4216b1441328c732c6906728b7c9
   salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20
+
+Windows:
+  parallel: false   # not supported on windows/cygwin