Remove unnecessary references to neutron core plugin hiera

If the tripleo::profile::base::neutron::sriov is included it
is expected that the SR-IOV agent should be deployed and configured so
references to core plugin configuration is out of place and currently
breaks deployment.

Change-Id: Ie5d8cd7863c0d042cc6a4e1fc52602d8a03a1935

diff --git a/manifests/profile/base/neutron/sriov.pp b/manifests/profile/base/neutron/sriov.pp
index 24c7b63..095da0f 100644 (file)
--- a/manifests/profile/base/neutron/sriov.pp
+++ b/manifests/profile/base/neutron/sriov.pp
@@ -23,23 +23,15 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
-# [*mechanism_drivers*]
-#   (Optional) The mechanism drivers to use with the Ml2 plugin
-#   Defaults to hiera('neutron::plugins::ml2::mechanism_drivers')
-#
 
 class tripleo::profile::base::neutron::sriov(
-  $step               = hiera('step'),
-  $mechanism_drivers  = hiera('neutron::plugins::ml2::mechanism_drivers'),
+  $step               = hiera('step')
 ) {
 
   include ::tripleo::profile::base::neutron
 
   if $step >= 4 {
-    if 'sriovnicswitch' in $mechanism_drivers  {
-      include ::neutron::agents::ml2::sriov
-      include ::tripleo::host::sriov
-    }
+    include ::neutron::agents::ml2::sriov
+    include ::tripleo::host::sriov
   }
-
 }