From 65feea44490f5a2f7f2cbcbaff036157bd27b75e Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Fri, 8 Jan 2016 08:48:10 -0500 Subject: [PATCH] AWS: don't rely on salt for kube-node-unpacker on AWS We've had a lot of salt problems with systemd on AWS; we have a workaround in place that we use everywhere else, we should use that for kube-node-unpacker too. Fixes #19386 Issue #19388 --- cluster/saltbase/salt/kube-node-unpacker/init.sls | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cluster/saltbase/salt/kube-node-unpacker/init.sls b/cluster/saltbase/salt/kube-node-unpacker/init.sls index 868271eadee..d5394f76fd5 100644 --- a/cluster/saltbase/salt/kube-node-unpacker/init.sls +++ b/cluster/saltbase/salt/kube-node-unpacker/init.sls @@ -25,7 +25,8 @@ kube-proxy-tar: # Super annoying, the salt version on GCE is old enough that 'salt.cmd.run' # isn't supported {% if grains.cloud is defined and grains.cloud == 'aws' %} - {% set is_helium = salt.cmd.run('salt --version | grep -c Helium') %} + # Salt has terrible problems with systemd on AWS too + {% set is_helium = '0' %} {% endif %} # Salt Helium doesn't support systemd modules for service running {% if pillar.get('is_systemd') and is_helium == '0' %}