Salt
/
salt-formula
mirror of https://github.com/saltstack-formulas/salt-formula.git
0
0
Fork 0
Code Issues Activity

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

This commit is contained in:
noelmcloughlin 2020-09-11 22:03:25 +01:00
parent a36f2eb2d2
commit 0c591bba95
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
salt/defaults.yaml
View File

@ -11,6 +11,7 @@ salt:
use_pip: false use_pip: false
clean_config_d_dir: true clean_config_d_dir: true
restart_via_at: false restart_via_at: false
parallel: true # salt.git module argument
config_path: /etc/salt config_path: /etc/salt

4
salt/formulas.sls
View File

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

3
salt/osmap.yaml
View File

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