openstack/openstack-ansible-os_sahara
Code Issues Proposed changes

Merge "Only replace python when re-initializing the venv"

Browse Source
This commit is contained in:
Zuul 2018-04-19 18:01:36 +00:00 committed by Gerrit Code Review
commit 7aed3ebb0f
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tasks/sahara_install.yml
View File

@ -110,11 +110,22 @@
- ansible_pkg_mgr in ['yum', 'zypper'] - ansible_pkg_mgr in ['yum', 'zypper']
- sahara_get_venv | changed - sahara_get_venv | changed
# NOTE(odyssey4me):
# We reinitialize the venv to ensure that the right
# version of python is in the venv, but we do not
# want virtualenv to also replace pip, setuptools
# and wheel so we tell it not to.
# We do not use --always-copy for CentOS/SuSE due
# to https://github.com/pypa/virtualenv/issues/565
- name: Update virtualenv path - name: Update virtualenv path
shell: | shell: |
find {{ sahara_bin }} -name \*.pyc -delete find {{ sahara_bin }} -name \*.pyc -delete
sed -si '1s/^.*python.*$/#!{{ sahara_bin | replace ('/','\/') }}\/python/' {{ sahara_bin }}/* sed -si '1s/^.*python.*$/#!{{ sahara_bin | replace ('/','\/') }}\/python/' {{ sahara_bin }}/*
virtualenv {{ sahara_bin | dirname }} virtualenv {{ sahara_bin | dirname }} \
{{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }} \
--no-pip \
--no-setuptools \
--no-wheel
when: sahara_get_venv | changed when: sahara_get_venv | changed
tags: tags:
- skip_ansible_lint - skip_ansible_lint