defaults: use a versioned path for stackviz/tempestconf virtualenv
When upgrading to Ussuri from Train we already had a virtualenv called 'stackviz'. As a result the upgrade process attempts to re-use the same virtualenv, which contains a pip executable for Python 2. When trying to install Python 3 packages this fails. We worked around this by using the same path versioning mechanism used for tempest and other components, forcing the creation of a new virtualenv. This patch applies this approach to the virtualenvs for stackviz and tempestconf. Change-Id: Iad382dfeb91d25c325b41d3adc7f703e0e4688a8
This commit is contained in:
parent
3e590ab572
commit
4a40fc8b80
@ -301,7 +301,8 @@ tempest_interface_name: "internal"
|
|||||||
# want to generate the tempest.conf file with this tool, instead of
|
# want to generate the tempest.conf file with this tool, instead of
|
||||||
# tempest.conf from the template
|
# tempest.conf from the template
|
||||||
tempest_use_tempestconf: false
|
tempest_use_tempestconf: false
|
||||||
tempest_tempestconf_venv_bin: "/openstack/venvs/tempestconf/bin"
|
tempest_tempestconf_venv_tag: "{{ venv_tag | default('untagged') }}"
|
||||||
|
tempest_tempestconf_venv_bin: "/openstack/venvs/tempestconf-{{ tempest_tempestconf_venv_tag }}/bin"
|
||||||
|
|
||||||
# We comment out `tempest_tempestconf_git_repo` so that the repo_build role does not attempt to
|
# We comment out `tempest_tempestconf_git_repo` so that the repo_build role does not attempt to
|
||||||
# build the wheel from this repo/branch. Instead, we want python-tempestconf to get built
|
# build the wheel from this repo/branch. Instead, we want python-tempestconf to get built
|
||||||
@ -326,5 +327,6 @@ tempest_tempestconf_profile_overrides: "{{ tempest_tempest_conf_overrides }}"
|
|||||||
# Stackviz tarball url
|
# Stackviz tarball url
|
||||||
stackviz_pip_install_args: "{{ pip_install_options | default('--isolated') }}"
|
stackviz_pip_install_args: "{{ pip_install_options | default('--isolated') }}"
|
||||||
stackviz_tarball: "https://tarballs.opendev.org/openstack/stackviz/dist/stackviz-latest.tar.gz"
|
stackviz_tarball: "https://tarballs.opendev.org/openstack/stackviz/dist/stackviz-latest.tar.gz"
|
||||||
stackviz_venv_bin: "/openstack/venvs/stackviz/bin"
|
stackviz_venv_tag: "{{ venv_tag | default('untagged') }}"
|
||||||
|
stackviz_venv_bin: "/openstack/venvs/stackviz-{{ stackviz_venv_tag }}/bin"
|
||||||
tempest_run_stackviz: true
|
tempest_run_stackviz: true
|
||||||
|
Loading…
Reference in New Issue
Block a user