From e5d5671df0a14390766326f8527230a6060b8624 Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Thu, 29 Jan 2015 15:13:19 -0500
Subject: [PATCH] Work-around for archive bug in SaltStack 2014.7.1

SaltStack 2014.7.1 double-quotes tar filenames which means the file can't
be found.  A workaround is not to specify tar_options, which hits a different
code path.  But that breaks the older version of SaltStack that GCE is locked
to, hence we need the version conditional (thanks @jbeda)

Fixes issue #3932
---
 cluster/saltbase/salt/etcd/init.sls | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cluster/saltbase/salt/etcd/init.sls b/cluster/saltbase/salt/etcd/init.sls
index d759a8815c3..3ad882ed1d1 100644
--- 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