Browse Source

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

tags/v1.5.2
noelmcloughlin 4 years ago
parent
commit
0c591bba95
3 changed files with 6 additions and 2 deletions
  1. +1
    -0
      salt/defaults.yaml
  2. +2
    -2
      salt/formulas.sls
  3. +3
    -0
      salt/osmap.yaml

+ 1
- 0
salt/defaults.yaml View File

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



+ 2
- 2
salt/formulas.sls View File

{%- 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 }}
{{ 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
- 0
salt/osmap.yaml View File

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

Loading…
Cancel
Save