Use python3-openvswitch from distro

We should use the same Python OVS bindings package
version as running OpenvSwitch. See related bug.

Closes-Bug: #1961874

(cherry picked from commit 8e8a499)

Change-Id: Ideae0c81d7c3833c8b0e22fce8691e9e42949ec5

Author: mnasiadka

docker/nova/nova-base/Dockerfile.j2

@@ -56,7 +56,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     {% if base_package_type == 'rpm' %}
 
         {% set nova_base_packages = [
-                'openvswitch'
+                'openvswitch',
+                'python3-openvswitch'
         ] %}
         {% if base_arch == 'x86_64' %}
             {% set nova_base_packages = nova_base_packages + [
@@ -79,7 +80,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'iptables',
             'openssh-client',
             'openvswitch-switch',
-            'python3-libvirt'
+            'python3-libvirt',
+            'python3-openvswitch'
         ] %}
         {% if base_arch == 'x86_64' %}
             {% set nova_base_packages = nova_base_packages + [

docker/octavia/octavia-base/Dockerfile.j2

@@ -23,6 +23,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.install_packages(octavia_base_packages | customizable("packages")) }}
 
 {% elif install_type == 'source' %}
+    {% set octavia_base_packages = [
+        'python3-openvswitch'
+    ] %}
+
+{{ macros.install_packages(octavia_base_packages | customizable("packages")) }}
+
 ADD octavia-base-archive /octavia-base-source
 
 {% set octavia_base_pip_packages = [

docker/openstack-base/Dockerfile.j2

@@ -312,6 +312,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

releasenotes/notes/distro-python-ovs-df705d1e59f16cde.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes an issue when older version of Python OpenvSwitch bindings package
+    was used, than the running OpenvSwitch code.
+    `LP#1961874 <https://launchpad.net/bugs/1961874>`__