From 3df1a1dde9dda0b4dfd6c91da65b53e58bb0d219 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Thu, 21 Oct 2021 13:33:59 +0200
Subject: [PATCH] ovn: Add Debian x86 images

aarch64 still has no installation candidate

Change-Id: I645f5d04ff2be3a5857765e901eccfe0b56ff199
---
 doc/source/matrix_x86.csv                               | 2 +-
 docker/ovn/ovn-base/Dockerfile.j2                       | 8 +-------
 kolla/image/build.py                                    | 5 ++++-
 releasenotes/notes/ovn-debian-x86-d584f88b9e94b226.yaml | 4 ++++
 4 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 releasenotes/notes/ovn-debian-x86-d584f88b9e94b226.yaml

diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv
index ddd8f08363..86cf9c6e40 100644
--- a/doc/source/matrix_x86.csv
+++ b/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
diff --git a/docker/ovn/ovn-base/Dockerfile.j2 b/docker/ovn/ovn-base/Dockerfile.j2
index d543419e90..99775bbccf 100644
--- a/docker/ovn/ovn-base/Dockerfile.j2
+++ b/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',
     ] %}
diff --git a/kolla/image/build.py b/kolla/image/build.py
index acefc286c5..ae6da24c5b 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -113,7 +113,6 @@ UNBUILDABLE_IMAGES = {
     '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
     },
 
@@ -121,6 +120,10 @@ UNBUILDABLE_IMAGES = {
         "qdrouterd",  # There is no qdrouterd package for Ubuntu
     },
 
+    'debian+aarch64': {
+        "ovn-base",      # no binary package
+    },
+
     'ubuntu+aarch64': {
         "kibana",        # no binary package
     },
diff --git a/releasenotes/notes/ovn-debian-x86-d584f88b9e94b226.yaml b/releasenotes/notes/ovn-debian-x86-d584f88b9e94b226.yaml
new file mode 100644
index 0000000000..315fbf6dce
--- /dev/null
+++ b/releasenotes/notes/ovn-debian-x86-d584f88b9e94b226.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    OVN images are now buildable for Debian x86.