aboutsummaryrefslogtreecommitdiff
path: root/docker/openstack-base
diff options
context:
space:
mode:
Diffstat (limited to 'docker/openstack-base')
-rw-r--r--docker/openstack-base/Dockerfile.j25
1 files changed, 5 insertions, 0 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 2e60a1589..afc724214 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -317,6 +317,11 @@ ENV DEBIAN_FRONTEND noninteractive
ADD openstack-base-archive /openstack-base-source
RUN ln -s openstack-base-source/* /requirements \
+{# NOTE(mnasiadka): Remove ovs from upper-constraints.txt because python3-openvswitch
+ is usually newer than UC entry and older version would get installed
+ in venv (see https://launchpad.net/bugs/1961874).
+#}
+ && sed -i /^ovs=/d /requirements/upper-constraints.txt \
&& mkdir -p /var/lib/kolla \
&& {{ macros.install_pip(['virtualenv'])}} \
&& virtualenv --system-site-packages /var/lib/kolla/venv