aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2020-10-16 13:10:03 +0200
committerMichal Nasiadka <mnasiadka@gmail.com>2020-10-19 10:38:46 +0000
commitb1709a87ed6bead417a3cd6848de068e06190370 (patch)
treeee8e52833bdeb60a5f3df814f736d0e5cbf92ef7
parentc26086b1bea35784a10d9b9682b7301175d27603 (diff)
downloadkolla-b1709a87ed6bead417a3cd6848de068e06190370.tar.gz
kolla-b1709a87ed6bead417a3cd6848de068e06190370.zip
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
-rw-r--r--docker/openstack-base/Dockerfile.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 399be3245..a1120332e 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -316,7 +316,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