diff --git a/tasks/watcher_install.yml b/tasks/watcher_install.yml index e1f0d74..90721f5 100644 --- a/tasks/watcher_install.yml +++ b/tasks/watcher_install.yml @@ -93,11 +93,22 @@ when: watcher_get_venv | failed or watcher_get_venv | skipped notify: Restart watcher 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 {{ watcher_bin }} -name \*.pyc -delete sed -si '1s/^.*python.*$/#!{{ watcher_bin | replace ('/','\/') }}\/python/' {{ watcher_bin }}/* - virtualenv {{ watcher_bin | dirname }} + virtualenv {{ watcher_bin | dirname }} \ + {{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }} \ + --no-pip \ + --no-setuptools \ + --no-wheel when: watcher_get_venv | changed tags: - skip_ansible_lint