From 98c269e5a60e9497175b9b8a31a6c8824975a065 Mon Sep 17 00:00:00 2001
From: Slawek Kaplonski <skaplons@redhat.com>
Date: Wed, 6 Oct 2021 12:04:41 +0200
Subject: [PATCH] Remove trunk related functions from neutron devstack plugin

As was discussed on the neutron team meeting [1] this will be now
part of the Devstack repo so it's not needed in the neutron devstack
plugin anymore.

[1] https://meetings.opendev.org/meetings/networking/2021/networking.2021-10-05-14.00.log.html#l-156

Depends-On: https://review.opendev.org/c/openstack/devstack/+/812657

Change-Id: I04dacb43f244d71e1c5b74deb63b234b803033c9
---
 devstack/lib/trunk | 7 -------
 devstack/plugin.sh | 4 ----
 2 files changed, 11 deletions(-)
 delete mode 100644 devstack/lib/trunk

diff --git a/devstack/lib/trunk b/devstack/lib/trunk
deleted file mode 100644
index 271ccd78cca..00000000000
--- a/devstack/lib/trunk
+++ /dev/null
@@ -1,7 +0,0 @@
-function configure_trunk_service_plugin {
-    neutron_service_plugin_class_add "trunk"
-}
-
-function configure_trunk_extension {
-    configure_trunk_service_plugin
-}
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index b34502d5b32..12fed01cd6d 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -11,7 +11,6 @@ source $LIBDIR/ml2
 source $LIBDIR/network_segment_range
 source $LIBDIR/qos
 source $LIBDIR/segments
-source $LIBDIR/trunk
 source $LIBDIR/placement
 source $LIBDIR/log
 source $LIBDIR/fip_port_forwarding
@@ -58,9 +57,6 @@ if [[ "$1" == "stack" ]]; then
             if is_service_enabled q-qos neutron-qos; then
                 configure_qos
             fi
-            if is_service_enabled q-trunk neutron-trunk; then
-                configure_trunk_extension
-            fi
             if is_service_enabled q-placement neutron-placement; then
                 configure_placement_extension
             fi