From c5b63d62f7dbdbe13c8dc50cd60568f77b1a8af5 Mon Sep 17 00:00:00 2001 From: Elijah Lazkani Date: Sun, 19 Mar 2017 00:11:40 -0400 Subject: [PATCH] Jinja wants to play hard to get --- salty/base/python_env/init.sls | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/salty/base/python_env/init.sls b/salty/base/python_env/init.sls index d54dd80..e7971fb 100644 --- a/salty/base/python_env/init.sls +++ b/salty/base/python_env/init.sls @@ -2,9 +2,9 @@ {% if grains['travis'] == True and grains['kernel'] == 'Linux' %} {% if "python2" in grains['pip'] %} - {% python_env.update({ 'pip_bin_env': '/opt/python/3.5.2/bin/pip3'}) %} + {% set pip_travis_env = '/opt/python/3.5.2/bin/pip3' %} {% else %} - {% python_env.update({'pip_bin_env': grains['pip']}) %} + {% set pip_travis_env = grains['pip'] %} {% endif %} {% endif %} @@ -16,7 +16,11 @@ virtualenv-install: pip.installed: - name: {{ python_env.virtualenv }} - user: {{ grains.user }} + {% if grains['travis'] == True and grains['kernel'] == 'Linux' %} + - bin_env: {{ pip_bin_env }} + {% else %} - bin_env: {{ python_env.pip_bin_env }} + {% endif %} - require: - pkg: pip-install @@ -24,7 +28,11 @@ virtualenvwrapper-install: pip.installed: - name: {{ python_env.virtualenvwrapper }} - user: {{ grains.user }} + {% if grains['travis'] == True and grains['kernel'] == 'Linux' %} + - bin_env: {{ pip_bin_env }} + {% else %} - bin_env: {{ python_env.pip_bin_env }} + {% endif %} - require: - pip: virtualenv-install