diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2022-02-24 17:00:56 +0100 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2022-03-01 16:59:33 +0000 |
| commit | 8e8a499adc3ae0c4009bacde65cf3a141632ef3c (patch) | |
| tree | ace2740e1d6023023b6ad39e784c01331776c785 /docker/openstack-base/Dockerfile.j2 | |
| parent | a9278d54378bc9d9a18ffa7d70f2e25aafdc16a8 (diff) | |
| download | kolla-8e8a499adc3ae0c4009bacde65cf3a141632ef3c.tar.gz kolla-8e8a499adc3ae0c4009bacde65cf3a141632ef3c.zip | |
Use python3-openvswitch from distro
We should use the same Python OVS bindings package
version as running OpenvSwitch. See related bug.
Closes-Bug: #1961874
Change-Id: Id6968e3ec1093f26f25f3045e2a6d8cc4f41adaa
Diffstat (limited to 'docker/openstack-base/Dockerfile.j2')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 5 |
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 |
