summaryrefslogtreecommitdiffstats
path: root/manifests/profile/base
diff options
context:
space:
mode:
authorBrent Eagles <beagles@redhat.com>2017-06-07 13:25:47 -0230
committerBrent Eagles <beagles@redhat.com>2017-06-07 13:25:59 -0230
commit4db65debf58d0508afb08ada43f2f262d3f5274f (patch)
tree690a7c9260153312de109e0491ab82cff9380709 /manifests/profile/base
parent0a75929adeea9ea7a53ad5a45c9bb1f1b6962b9b (diff)
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
Diffstat (limited to 'manifests/profile/base')
-rw-r--r--manifests/profile/base/neutron/sriov.pp14
1 files changed, 3 insertions, 11 deletions
diff --git a/manifests/profile/base/neutron/sriov.pp b/manifests/profile/base/neutron/sriov.pp
index 24c7b63..095da0f 100644
--- 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
}
-
}