From 928c4648a4c2cf08c616d74f340c675418ba3385 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Tue, 6 Jul 2021 09:56:29 +0100
Subject: [PATCH] ironic-neutron-agent: enable for Debuntu binary

Packages are available for focal and bullseye.

Change-Id: I61623748d1149adb1b096adf2fffb5a902df3181
---
 doc/source/matrix_aarch64.csv                               | 2 --
 doc/source/matrix_x86.csv                                   | 2 --
 .../networking-baremetal/ironic-neutron-agent/Dockerfile.j2 | 5 +++--
 docker/neutron/neutron-server/Dockerfile.j2                 | 1 +
 kolla/image/build.py                                        | 2 --
 .../debuntu-ironic-neutron-agent-6534d616b37643a8.yaml      | 6 ++++++
 6 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 releasenotes/notes/debuntu-ironic-neutron-agent-6534d616b37643a8.yaml

diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv
index ca14eff6b7..49cb149409 100644
--- a/doc/source/matrix_aarch64.csv
+++ b/doc/source/matrix_aarch64.csv
@@ -26,8 +26,6 @@ heat,C,C,C,C,N,C
 horizon,C,C,C,C,N,C
 influxdb,N,N,C,C,N,C
 ironic,C,C,C,C,N,C
-ironic-neutron-agent,N,N,N,N,N,N
-ironic-inspector,N,N,N,N,N,N
 iscsid,C,C,C,C,N,C
 kafka,C,C,C,C,N,C
 keepalived,C,C,C,C,N,C
diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv
index 680fbd3cfb..b180a23962 100644
--- a/doc/source/matrix_x86.csv
+++ b/doc/source/matrix_x86.csv
@@ -27,8 +27,6 @@ heat,T,T,N,T,C,T
 horizon,T,T,T,T,C,T
 influxdb,C,C,C,C,C,C
 ironic,T,T,C,T,C,C
-ironic-neutron-agent,T,T,N,T,N,C
-ironic-inspector,T,T,C,T,C,C
 iscsid,T,T,T,T,C,C
 kafka,C,C,C,C,C,C
 keepalived,T,T,T,T,C,C
diff --git a/docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2 b/docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2
index 8f0c72a5bc..10cf3d3d52 100644
--- a/docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2
+++ b/docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2
@@ -18,8 +18,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
     {% elif base_package_type == 'deb' %}
 
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-            && /bin/false
+        {% set ironic_neutron_agent_packages = [
+            'ironic-neutron-agent',
+        ] %}
 
     {% endif %}
 
diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2
index c7f975fe44..f1c4ee1e8a 100644
--- a/docker/neutron/neutron-server/Dockerfile.j2
+++ b/docker/neutron/neutron-server/Dockerfile.j2
@@ -17,6 +17,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     {% elif base_package_type == 'deb' %}
 
         {% set neutron_server_packages = [
+            'python3-ironic-neutron-agent',
             'python3-neutron-dynamic-routing',
             'python3-neutron-vpnaas'
         ] %}
diff --git a/kolla/image/build.py b/kolla/image/build.py
index fc897bdd28..022e142330 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -138,14 +138,12 @@ UNBUILDABLE_IMAGES = {
 
     'debian+binary': {
         "cloudkitty-base",       # no support in Dockerfile
-        "ironic-neutron-agent",  # no support in Dockerfile
         "nova-serialproxy",      # no binary package
         "tacker-base",           # no binary package
     },
 
     'ubuntu+binary': {
         "cloudkitty-base",
-        "ironic-neutron-agent",
         "senlin-conductor",  # no binary package
         "senlin-health-manager",  # no binary package
         "tacker-base",
diff --git a/releasenotes/notes/debuntu-ironic-neutron-agent-6534d616b37643a8.yaml b/releasenotes/notes/debuntu-ironic-neutron-agent-6534d616b37643a8.yaml
new file mode 100644
index 0000000000..ca896f5dd6
--- /dev/null
+++ b/releasenotes/notes/debuntu-ironic-neutron-agent-6534d616b37643a8.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Adds support for the ``ironic-neutron-agent`` image in Debian and Ubuntu
+    binary images. Also adds support for the ``baremetal`` ML2 driver in the
+    ``neutron-server`` image in Debian and Ubuntu binary images.