elia/pinch-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Jinja wants to play hard to get

Browse source
This commit is contained in:
Elijah Lazkani 2017-03-19 00:11:40 -04:00
parent fb76c4f34a
commit c5b63d62f7
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
salty/base/python_env/init.sls
View file

@ -2,9 +2,9 @@
{% if grains['travis'] == True and grains['kernel'] == 'Linux' %} {% if grains['travis'] == True and grains['kernel'] == 'Linux' %}
{% if "python2" in grains['pip'] %} {% 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 %} {% else %}
{% python_env.update({'pip_bin_env': grains['pip']}) %} {% set pip_travis_env = grains['pip'] %}
{% endif %} {% endif %}
{% endif %} {% endif %}
@ -16,7 +16,11 @@ virtualenv-install:
pip.installed: pip.installed:
- name: {{ python_env.virtualenv }} - name: {{ python_env.virtualenv }}
- user: {{ grains.user }} - user: {{ grains.user }}
{% if grains['travis'] == True and grains['kernel'] == 'Linux' %}
- bin_env: {{ pip_bin_env }}
{% else %}
- bin_env: {{ python_env.pip_bin_env }} - bin_env: {{ python_env.pip_bin_env }}
{% endif %}
- require: - require:
- pkg: pip-install - pkg: pip-install
@ -24,7 +28,11 @@ virtualenvwrapper-install:
pip.installed: pip.installed:
- name: {{ python_env.virtualenvwrapper }} - name: {{ python_env.virtualenvwrapper }}
- user: {{ grains.user }} - user: {{ grains.user }}
{% if grains['travis'] == True and grains['kernel'] == 'Linux' %}
- bin_env: {{ pip_bin_env }}
{% else %}
- bin_env: {{ python_env.pip_bin_env }} - bin_env: {{ python_env.pip_bin_env }}
{% endif %}
- require: - require:
- pip: virtualenv-install - pip: virtualenv-install