Merge "ovn: Add Debian x86 images"

Author: Zuul

doc/source/matrix_x86.csv

@@ -49,7 +49,7 @@ nova,T,T,T,T,C,T
 nova-spicehtml5proxy,N,N,T,T,C,T
 octavia,C,C,N,C,C,C
 openvswitch,T,T,T,T,C,T
-ovn,C,C,C,C,N,N
+ovn,C,C,C,C,C,C
 ovsdpdk,N,N,C,C,C,C
 placement,T,T,T,T,C,T
 prometheus,C,C,C,C,C,C

docker/ovn/ovn-base/Dockerfile.j2

@@ -12,13 +12,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'openvswitch-ovn-common',
     ] %}
 
-{% elif base_distro in ['debian'] %}
-    # NOTE(hrw): 'ovn-common' is provided by 'openvswitch-common'
-    {% set ovn_base_packages = [
-        'openvswitch-common',
-    ] %}
-
-{% elif base_distro in ['ubuntu'] %}
+{% elif base_package_type == 'deb' %}
     {% set ovn_base_packages = [
         'ovn-common',
     ] %}

kolla/image/build.py

@@ -108,14 +108,17 @@ class Status(Enum):
     'debian': {
         "bifrost-base",  # tries to install 'mysql-server' which is not in
                          # Debian 'buster' (fixed in Yoga)
-        "ovn-base",      # no OVN package in Debian bullseye
         "qdrouterd",     # no qdrouterd package in Debian bullseye
     },
 
     'ubuntu': {
         "qdrouterd",  # There is no qdrouterd package for Ubuntu
     },
 
+    'debian+aarch64': {
+        "ovn-base",      # no binary package
+    },
+
     'ubuntu+aarch64': {
         "kibana",        # no binary package
         "monasca-base",  # 'confluent-kafka' requires newer libfdkafka-dev

releasenotes/notes/ovn-debian-x86-d584f88b9e94b226.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    OVN images are now buildable for Debian x86.