From a4f6a8f05b45838338ee1c6a78f278d49486ac03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Nasiadka?= <mnasiadka@gmail.com>
Date: Tue, 27 Apr 2021 17:23:26 +0200
Subject: [PATCH] neutron: Remove vmware-nsx and networking-mlx from binary

Those plugins have been already removed from source images, this
change removes them from binary.

Change-Id: If21a21296489c1f243bb46f2595ff94d999bd686
---
 contrib/neutron-plugins/README.rst                           | 5 ++++-
 contrib/neutron-plugins/template_override-networking-mlnx.j2 | 4 ++++
 contrib/neutron-plugins/template_override-vmware-nsx.j2      | 4 ++++
 docker/neutron/neutron-base/Dockerfile.j2                    | 3 ---
 .../wallaby-neutron-plugins-excluded-b72220a2ea8c1a40.yaml   | 5 ++---
 5 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 contrib/neutron-plugins/template_override-networking-mlnx.j2
 create mode 100644 contrib/neutron-plugins/template_override-vmware-nsx.j2

diff --git a/contrib/neutron-plugins/README.rst b/contrib/neutron-plugins/README.rst
index 2dc42165d3..e72d6c5e9d 100644
--- a/contrib/neutron-plugins/README.rst
+++ b/contrib/neutron-plugins/README.rst
@@ -3,7 +3,10 @@ contrib/neutron-plugins directory
 
 This directory contains example plugin definitions for neutron-base, to
 be included in the kolla-build.conf (ini file with kolla-build
-configuration).
+configuration) when using source type builds.
+
+In case of binary builds - please see template_override j2 files.
+
 Please read the main Kolla documentation on plugins for details.
 These should work simply by pasting them into the config file.
 You may want to adjust the filename to match the branch you are
diff --git a/contrib/neutron-plugins/template_override-networking-mlnx.j2 b/contrib/neutron-plugins/template_override-networking-mlnx.j2
new file mode 100644
index 0000000000..3f05f73930
--- /dev/null
+++ b/contrib/neutron-plugins/template_override-networking-mlnx.j2
@@ -0,0 +1,4 @@
+{% extends parent_template %}
+
+# Neutron networking-mlnx plugin
+{% set neutron_base_packages_append = ['python3-networking-mlnx'] %}
diff --git a/contrib/neutron-plugins/template_override-vmware-nsx.j2 b/contrib/neutron-plugins/template_override-vmware-nsx.j2
new file mode 100644
index 0000000000..f803420715
--- /dev/null
+++ b/contrib/neutron-plugins/template_override-vmware-nsx.j2
@@ -0,0 +1,4 @@
+{% extends parent_template %}
+
+# Neutron vmware-nsx plugin
+{% set neutron_base_packages_append = ['python3-networking-vmware-nsx'] %}
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index 40cb801d45..2c85918186 100644
--- a/docker/neutron/neutron-base/Dockerfile.j2
+++ b/docker/neutron/neutron-base/Dockerfile.j2
@@ -22,9 +22,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'openstack-neutron-ml2',
             'openvswitch',
             'python3-networking-baremetal',
-            'python3-networking-mlnx',
             'python3-networking-sfc',
-            'python3-networking-vmware-nsx',
             'python3-openvswitch',
             'python3-oslo-vmware'
         ] %}
@@ -40,7 +38,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'neutron-plugin-ml2',
             'neutron-server',
             'openvswitch-switch',
-            'python3-networking-mlnx',
             'python3-networking-sfc',
             'python3-openvswitch',
             'python3-oslo.vmware'
diff --git a/releasenotes/notes/wallaby-neutron-plugins-excluded-b72220a2ea8c1a40.yaml b/releasenotes/notes/wallaby-neutron-plugins-excluded-b72220a2ea8c1a40.yaml
index 4c3905ae50..fb7c01d8aa 100644
--- a/releasenotes/notes/wallaby-neutron-plugins-excluded-b72220a2ea8c1a40.yaml
+++ b/releasenotes/notes/wallaby-neutron-plugins-excluded-b72220a2ea8c1a40.yaml
@@ -1,7 +1,7 @@
 ---
 upgrade:
   - |
-      Three Neutron plugins are no longer provided by default in source
+      Three Neutron plugins are no longer provided by default in
       images:
       ``networking-ansible``, ``networking-mlnx`` and ``vmware-nsx``.
       The main reason is that they lag in synchronising with OpenStack
@@ -10,5 +10,4 @@ upgrade:
       directory.
       Please read the included ``README.rst`` in case you depend on
       them.
-      Please note they are no longer included in published source
-      images.
+      Please note they are no longer included in published images.