summaryrefslogtreecommitdiffstats
path: root/manifests/profile
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-14 00:59:48 +0000
committerGerrit Code Review <review@openstack.org>2017-06-14 00:59:48 +0000
commitc54c7d5caddcbf36db31a4d478f293a86faf0154 (patch)
treeb15c82ba9a1462ee576f58ab558ddfc4a44e32b7 /manifests/profile
parent4a9a1e9d4841b7e2e7e8133283d16743874ce87c (diff)
parent4db65debf58d0508afb08ada43f2f262d3f5274f (diff)
Merge "Remove unnecessary references to neutron core plugin hiera"
Diffstat (limited to 'manifests/profile')
-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
}
-
}