From 5d0a9773ac3cf4c764a054b79546c66582749c4d Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Sun, 31 Aug 2025 18:00:40 +0900
Subject: [PATCH] Drop unnecessary resource ordering

We don't have to explicit require the base ml2 class, because
the required resource orders are now enforced through anchors.

Change-Id: Iff05915e7fa23dade2656487a3536c5039a86104
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
---
 manifests/plugins/ml2/arista.pp    | 2 +-
 manifests/plugins/ml2/arista/l3.pp | 1 -
 manifests/plugins/ml2/bagpipe.pp   | 1 -
 manifests/plugins/ml2/ovn.pp       | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/manifests/plugins/ml2/arista.pp b/manifests/plugins/ml2/arista.pp
index d0d57349b..9447fdb4d 100644
--- a/manifests/plugins/ml2/arista.pp
+++ b/manifests/plugins/ml2/arista.pp
@@ -63,7 +63,7 @@ class neutron::plugins::ml2::arista (
   $package_ensure = 'present'
 ) {
   include neutron::deps
-  require neutron::plugins::ml2
+  include neutron::params
 
   neutron_plugin_ml2 {
     'ml2_arista/eapi_host'    : value => $eapi_host;
diff --git a/manifests/plugins/ml2/arista/l3.pp b/manifests/plugins/ml2/arista/l3.pp
index 228d4be59..43f671a2e 100644
--- a/manifests/plugins/ml2/arista/l3.pp
+++ b/manifests/plugins/ml2/arista/l3.pp
@@ -61,7 +61,6 @@ class neutron::plugins::ml2::arista::l3 (
   $use_vrf                  = $facts['os_service_default'],
 ) {
   include neutron::deps
-  require neutron::plugins::ml2
 
   # TODO(tkajinam): Reconsider how we implement this. We probably should allow
   #                 more flexible values like 'on' supported by oslo.config.
diff --git a/manifests/plugins/ml2/bagpipe.pp b/manifests/plugins/ml2/bagpipe.pp
index 9b6494c93..a2c9f81fd 100644
--- a/manifests/plugins/ml2/bagpipe.pp
+++ b/manifests/plugins/ml2/bagpipe.pp
@@ -40,7 +40,6 @@ class neutron::plugins::ml2::bagpipe (
 ) {
   include neutron::deps
   include neutron::params
-  require neutron::plugins::ml2
 
   neutron_plugin_ml2 {
     'bagpipe/bagpipe_bgp_port':       value => $bagpipe_bgp_port;
diff --git a/manifests/plugins/ml2/ovn.pp b/manifests/plugins/ml2/ovn.pp
index 9f9221ef3..50f094238 100644
--- a/manifests/plugins/ml2/ovn.pp
+++ b/manifests/plugins/ml2/ovn.pp
@@ -238,7 +238,6 @@ class neutron::plugins::ml2::ovn (
   $ovn_emit_need_to_frag                = undef,
 ) {
   include neutron::deps
-  require neutron::plugins::ml2
 
   if $ovn_emit_need_to_frag != undef {
     warning('The ovn_emit_need_to_frag parameter has been deprecated.')