Merge "Only replace python when re-initializing the venv"
This commit is contained in:
commit
216f4ce8e4
|
@ -99,12 +99,22 @@
|
|||
notify:
|
||||
- Restart Searchlight services
|
||||
|
||||
|
||||
# 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
|
||||
shell: |
|
||||
find {{ searchlight_bin }} -name \*.pyc -delete
|
||||
sed -si '1s/^.*python.*$/#!{{ searchlight_bin | replace ('/','\/') }}\/python/' {{ searchlight_bin }}/*
|
||||
virtualenv {{ searchlight_bin | dirname }}
|
||||
virtualenv {{ searchlight_bin | dirname }} \
|
||||
{{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }} \
|
||||
--no-pip \
|
||||
--no-setuptools \
|
||||
--no-wheel
|
||||
when:
|
||||
- not searchlight_developer_mode | bool
|
||||
- searchlight_get_venv | success
|
||||
|
|
Loading…
Reference in New Issue