Merge "Ensure virtualenv is not broken for CentOS/SuSE too" into stable/queens

defaults/main.yml

@@ -102,9 +102,12 @@ repo_build_venv_pip_install_options: >-
 # without them and use get-pip.py later to install them
 # into the venv. This prevents messy upgrade/downgrade
 # failures when trying to install the versions we want.
+# NOTE(odyssey4me):
+# Not using --always-copy for CentOS/SuSE due to
+# https://github.com/pypa/virtualenv/issues/565
 repo_build_venv_command_options: >-
   {{ virtualenv_bin }}
-  --always-copy
+  {{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }}
   --no-pip
   --no-setuptools
   --no-wheel

vars/redhat.yml

@@ -36,9 +36,3 @@ repo_build_distro_packages:
   - swig
   - which
   - tar                     # required for /opt/op-venv-script.sh
-
-# workaround for https://github.com/pypa/virtualenv/issues/565
-repo_build_venv_command_options: >
-  {{ virtualenv_bin }}
-  --extra-search-dir {{ repo_build_release_path }}
-  --never-download

vars/suse-42.yml

@@ -39,9 +39,3 @@ repo_build_distro_packages:
   - swig
   - which
   - tar                     # required for /opt/op-venv-script.sh
-
-# workaround for https://github.com/pypa/virtualenv/issues/565
-repo_build_venv_command_options: >
-  {{ virtualenv_bin }}
-  --extra-search-dir {{ repo_build_release_path }}
-  --never-download