5 files changed, 54 insertions, 0 deletions
diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv
index efc660a5d..c5d28a7c2 100644
--- a/doc/source/matrix_aarch64.csv
+++ b/doc/source/matrix_aarch64.csv
@@ -52,6 +52,7 @@ mongodb,N,N,C,C,N,N
 multipathd,C,C,C,C,N,C
 murano,C,C,C,C,N,C
 neutron,C,C,C,C,N,C
+neutron-mlnx-agent,C,C,N,C,N,C
 nova,C,C,C,C,N,C
 novajoin,C,C,N,C,N,C
 octavia,C,C,N,C,N,C
diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv
index 7a195d32c..59a1b9901 100644
--- a/doc/source/matrix_x86.csv
+++ b/doc/source/matrix_x86.csv
@@ -52,6 +52,7 @@ mongodb,C,C,C,C,N,N
 multipathd,C,C,C,C,N,C
 murano,C,C,C,C,N,C
 neutron,T,T,T,T,N,T
+neutron-mlnx-agent,C,C,N,C,N,C
 nova,T,T,T,T,N,T
 novajoin,C,C,N,C,N,C
 octavia,C,C,N,C,N,C
diff --git a/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 b/docker/neutron/neutron-mlnx-agent/Dockerfile.j2
new file mode 100644
index 000000000..7bb7adfaa
--- /dev/null
+++ b/docker/neutron/neutron-mlnx-agent/Dockerfile.j2
@@ -0,0 +1,46 @@
+FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+
+{% block neutron_mlnx_agent_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{% if base_package_type == 'rpm' %}
+
+    {% set neutron_mlnx_agent_packages = [
+        'libvirt-python',
+        'python-ethtool',
+    ] %}
+
+{% elif base_package_type == 'deb' %}
+
+    {% set neutron_mlnx_agent_packages = [
+        'python-libvirt',
+        'python-ethtool',
+    ] %}
+
+{% endif %}
+
+{% if install_type == 'binary' %}
+
+    {% set neutron_mlnx_agent_packages = neutron_mlnx_agent_packages + [
+        'python-networking-mlnx'
+    ] %}
+
+{{ macros.install_packages(neutron_mlnx_agent_packages | customizable("packages")) }}
+
+{% elif install_type == 'source' %}
+
+    {% set neutron_mlnx_agent_pip_packages = [
+            'networking-mlnx'
+    ] %}
+
+{{ macros.install_packages(neutron_mlnx_agent_packages | customizable("packages")) }}
+RUN {{ macros.install_pip(neutron_mlnx_agent_pip_packages | customizable("pip_packages")) }}
+
+{% endif %}
+
+{% block neutron_mlnx_agent_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER neutron
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 1ad51ee35..701bd491e 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -202,6 +202,7 @@ UNBUILDABLE_IMAGES = {
         "tripleoclient",
         "trove-base",
         "vitrage-base",
+        "neutron-mlnx-agent",
     },
 
     'ubuntu+binary': {
@@ -216,6 +217,7 @@ UNBUILDABLE_IMAGES = {
         "tripleoclient",
         "vitrage-base",
         "zaqar",
+        "neutron-mlnx-agent",
     },
 }
 
diff --git a/releasenotes/notes/add-neutron-mlnx-agent-b77a4ad9ba3beaae.yaml b/releasenotes/notes/add-neutron-mlnx-agent-b77a4ad9ba3beaae.yaml
new file mode 100644
index 000000000..40ea3da46
--- /dev/null
+++ b/releasenotes/notes/add-neutron-mlnx-agent-b77a4ad9ba3beaae.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Adds Neutron Mellanox agent image.