From bebad0409ea1f4a6b9de8051821f6b3fa444aca3 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Fri, 16 Oct 2020 13:10:03 +0200 Subject: [PATCH] Use upper constraints for virtualenv in openstack-base Since Rally has virtualenv in requirements, and is using contraints - it's trying to downgrade virtualenv from inside a virtualenv. Let's try to install proper version of packages in openstack-base. Closes-Bug: #1900419 Change-Id: I2a1e2b6661fd4b62648756416e6147b604dda686 (cherry picked from commit b1709a87ed6bead417a3cd6848de068e06190370) --- docker/openstack-base/Dockerfile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 4f9297077c..28920420f3 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -313,7 +313,7 @@ ENV DEBIAN_FRONTEND noninteractive ADD openstack-base-archive /openstack-base-source RUN ln -s openstack-base-source/* /requirements \ && mkdir -p /var/lib/kolla \ - && {{ macros.install_pip(['virtualenv'], constraints = false)}} \ + && {{ macros.install_pip(['virtualenv'])}} \ && virtualenv --system-site-packages /var/lib/kolla/venv ENV PATH /var/lib/kolla/venv/bin:$PATH