openstack
/
puppet-tripleo
Code Issues Proposed changes

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
Closes-Bug: #1703687
(cherry picked from commit 4db65debf5)
This commit is contained in:
Brent Eagles 2017-06-07 13:25:47 -02:30 committed by Alex Schultz
parent f175a6e282
commit fd9fbf070b
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/profile/base/neutron/sriov.pp
View File

@ -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
}
}