From d29aca985e3177d30de2245e0a96a3690932921c Mon Sep 17 00:00:00 2001
From: Bharat Kunwar <bharat@stackhpc.com>
Date: Wed, 22 Jul 2020 16:56:20 +0100
Subject: [PATCH] Support neutron-mlnx-agent

Depends-On: I173669bdf92b1f2ea98907ba16808ca3c914944c
Change-Id: I5a5bd255b937fe5d4c56cc21ef898b796c5bda41
---
 ansible/group_vars/all/kolla                                | 3 +++
 ansible/roles/kolla-ansible/vars/main.yml                   | 1 +
 etc/kayobe/kolla.yml                                        | 1 +
 releasenotes/notes/neutron-mlnx-agent-19631a3936da47df.yaml | 4 ++++
 4 files changed, 9 insertions(+)
 create mode 100644 releasenotes/notes/neutron-mlnx-agent-19631a3936da47df.yaml

diff --git a/ansible/group_vars/all/kolla b/ansible/group_vars/all/kolla
index b2d6f2a24..a2d040401 100644
--- a/ansible/group_vars/all/kolla
+++ b/ansible/group_vars/all/kolla
@@ -201,6 +201,8 @@ overcloud_container_image_regex_map:
   # Neutron SFC agent not currently supported on CentOS binary builds.
   - regex: "neutron-\\(dhcp\\|l3\\|metadata\\|openvswitch\\)-agent"
     enabled: "{{ kolla_enable_neutron | bool }}"
+  - regex: neutron-mlnx-agent
+    enabled: "{{ kolla_enable_neutron_mlnx | bool }}"
   - regex: nova
     enabled: "{{ kolla_enable_nova | bool }}"
   - regex: octavia
@@ -449,6 +451,7 @@ kolla_enable_mistral: "no"
 kolla_enable_monasca: "no"
 kolla_enable_multipathd: "no"
 kolla_enable_murano: "no"
+kolla_enable_neutron_mlnx: "no"
 kolla_enable_neutron_provider_networks: "no"
 kolla_enable_octavia: "no"
 kolla_enable_openvswitch: "{{ kolla_enable_neutron | bool }}"
diff --git a/ansible/roles/kolla-ansible/vars/main.yml b/ansible/roles/kolla-ansible/vars/main.yml
index ccf139899..01e0d951f 100644
--- a/ansible/roles/kolla-ansible/vars/main.yml
+++ b/ansible/roles/kolla-ansible/vars/main.yml
@@ -160,6 +160,7 @@ kolla_feature_flags:
   - neutron_dvr
   - neutron_infoblox_ipam_agent
   - neutron_metering
+  - neutron_mlnx
   - neutron_port_forwarding
   - neutron_provider_networks
   - neutron_qos
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 81f54e98e..2eb9512d0 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -273,6 +273,7 @@
 #kolla_enable_neutron_dvr:
 #kolla_enable_neutron_infoblox_ipam_agent:
 #kolla_enable_neutron_metering:
+#kolla_enable_neutron_mlnx:
 #kolla_enable_neutron_port_forwarding:
 #kolla_enable_neutron_provider_networks:
 #kolla_enable_neutron_qos:
diff --git a/releasenotes/notes/neutron-mlnx-agent-19631a3936da47df.yaml b/releasenotes/notes/neutron-mlnx-agent-19631a3936da47df.yaml
new file mode 100644
index 000000000..1c65c4bc5
--- /dev/null
+++ b/releasenotes/notes/neutron-mlnx-agent-19631a3936da47df.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Adds support for deploying the Neutron Mellanox agent.