commit 33214c20f3d7faa60c4abd3a4528e5b847afaefe
author Martin Polreich <polreichmartin@gmail.com> Mon Jul 16 15:09:23 2018 +0200
committer Martin Polreich <polreichmartin@gmail.com> Mon Jul 16 15:09:23 2018 +0200
tree f1bb89e2578977e8a159d247d230e53bcd467065
parent 1cd96421d0417735697d8f05b466ba71436960c0

Fix archive.extracted fail due to existing directory

Change-Id: I5ef66c7c72fc8e1c5e074d2b84923922851cfddc

helm/client_installed.sls

diff --git a/helm/client_installed.sls b/helm/client_installed.sls
index d9f7710..9d46e3b 100644
--- a/helm/client_installed.sls
+++ b/helm/client_installed.sls
@@ -13,22 +13,19 @@
     ) %}
 
 {{ constants.helm.tmp }}:
-  file.directory:
-    - user: root
-    - group: root
   archive.extracted:
     - source: {{ binary_source }}
     - source_hash: {{ config.download_hash }}
     - archive_format: tar
+    - user: root
+    - group: root
     {%- if grains['saltversioninfo'] < [2016, 11] %}
     - tar_options: v
     {%- else %}
     - options: v
     {%- endif %}
     - onlyif:
-        - test "{{ config.version }}" -eq "canary" || test ! -e {{ constants.helm.tmp }}/{{ config.flavor }}/helm
-    - require:
-      - file: {{ constants.helm.tmp }}
+        - test "{{ config.version }}" = "canary" || test ! -e {{ constants.helm.tmp }}/{{ config.flavor }}/helm
 
 {{ config.bin }}:
   file.copy: