Merge pull request #3970 from justinsb/fix_aws

aws cluster/kube-up.sh fixes
2015-01-30 07:56:01 -08:00
parent ee3470def5 d8791acdba
commit db416c4f39
9 changed files with 70 additions and 37 deletions
--- a/cluster/saltbase/salt/etcd/init.sls
+++ b/cluster/saltbase/salt/etcd/init.sls
@@ -24,7 +24,9 @@ etcd-tar:
    - source_hash: {{ etcd_tar_hash }}
    - archive_format: tar
    - if_missing: /usr/local/src/etcd-{{ etcd_version }}-linux-amd64
+{% if grains['saltversioninfo'] <= (2014, 7, 0, 0) %}
    - tar_options: xz
+{% endif %}
  file.directory:
    - name: /usr/local/src/etcd-{{ etcd_version }}-linux-amd64
    - user: root