add work-around for saltstack/salt#42681

jdelic · Sep 6, 2017 · f1645d7 · f1645d7
1 parent 8211c5b
commit f1645d7
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 0 deletions.
diff --git a/srv/salt/consul/install.sls b/srv/salt/consul/install.sls
@@ -135,6 +135,7 @@ consul:
         - source: {{pillar["urls"]["consul"]}}
         - source_hash: {{pillar["hashes"]["consul"]}}
         - archive_format: zip
+        - unless: test -f /usr/local/bin/consul  # workaround for https://github.com/saltstack/salt/issues/42681
         - if_missing: /usr/local/bin/consul
         - enforce_toplevel: False
     file.managed:

diff --git a/srv/salt/consul/template.sls b/srv/salt/consul/template.sls
@@ -4,7 +4,9 @@ consul-template:
         - name: /usr/local/bin
         - source: {{pillar["urls"]["consul-template"]}}
         - source_hash: {{pillar["hashes"]["consul-template"]}}
+        - keep: True
         - archive_format: zip
+        - unless: test -f /usr/local/bin/consul-template  # workaround for https://github.com/saltstack/salt/issues/42681
         - if_missing: /usr/local/bin/consul-template
         - enforce_toplevel: False
     file.managed:

diff --git a/srv/salt/dev/exxo.sls b/srv/salt/dev/exxo.sls
@@ -16,6 +16,7 @@ exxo:
         - source: {{pillar["urls"]["exxo"]}}
         - source_hash: {{pillar["hashes"]["exxo"]}}
         - archive_format: tar
+        - unless: test -f /usr/local/bin/exxo  # workaround for https://github.com/saltstack/salt/issues/42681
         - if_missing: /usr/local/bin/exxo
         - enforce_toplevel: False
     file.managed:

diff --git a/srv/salt/dev/fpm.sls b/srv/salt/dev/fpm.sls
@@ -23,6 +23,7 @@ fpm:
         - source: {{pillar["urls"]["fpmdeps"]}}
         - source_hash: {{pillar["hashes"]["fpmdeps"]}}
         - archive_format: zip
+        - unless: test -f /usr/local/src/fpm/fpm-1.8.1.gem  # workaround for https://github.com/saltstack/salt/issues/42681
         - if_missing: /usr/local/src/fpm/fpm-1.8.1.gem
         - enforce_toplevel: False
         - require:

diff --git a/srv/salt/nomad/client.sls b/srv/salt/nomad/client.sls
@@ -89,6 +89,7 @@ nomad:
         - source: {{pillar["urls"]["nomad"]}}
         - source_hash: {{pillar["hashes"]["nomad"]}}
         - archive_format: zip
+        - unless: test -f /usr/local/bin/nomad  # workaround for https://github.com/saltstack/salt/issues/42681
         - if_missing: /usr/local/bin/nomad
         - enforce_toplevel: False
     file.managed:

diff --git a/srv/salt/vault/init.sls b/srv/salt/vault/init.sls
@@ -69,6 +69,7 @@ vault:
         - source: {{pillar["urls"]["vault"]}}
         - source_hash: {{pillar["hashes"]["vault"]}}
         - archive_format: zip
+        - unless: test -f /usr/local/bin/vault  # workaround for https://github.com/saltstack/salt/issues/42681
         - if_missing: /usr/local/bin/vault
         - enforce_toplevel: False
     file.managed: