Merge pull request #19407 from justinsb/aws_fix_salt_helium_detection

AWS: don't rely on salt for kube-node-unpacker on AWS
This commit is contained in:
Alex Mohr 2016-01-21 10:38:08 -08:00
commit 8755f3e8a3

View File

@ -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' %}