aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-06 23:17:11 +0000
committerGerrit Code Review <review@openstack.org>2017-04-06 23:17:11 +0000
commit58e4dc837f77a92585a8f54d3cf642014c40bd6e (patch)
treecd0e0c3e3650e9543397ef05a1bf7059a51e4390
parent7ac3d9d8a4dbdb9dd31354c2bdab62be032df0c7 (diff)
parent79e3a9fe3bde6dd253db1de06307695d03550a4d (diff)
Merge "Fixes missing neutron base in sriov" into stable/ocata
-rw-r--r--manifests/profile/base/neutron/sriov.pp2
-rw-r--r--releasenotes/notes/fix-sriov-neutron-base-3e32bd667886c474.yaml3
2 files changed, 5 insertions, 0 deletions
diff --git a/manifests/profile/base/neutron/sriov.pp b/manifests/profile/base/neutron/sriov.pp
index 00ecc21..24c7b63 100644
--- a/manifests/profile/base/neutron/sriov.pp
+++ b/manifests/profile/base/neutron/sriov.pp
@@ -33,6 +33,8 @@ class tripleo::profile::base::neutron::sriov(
$mechanism_drivers = hiera('neutron::plugins::ml2::mechanism_drivers'),
) {
+ include ::tripleo::profile::base::neutron
+
if $step >= 4 {
if 'sriovnicswitch' in $mechanism_drivers {
include ::neutron::agents::ml2::sriov
diff --git a/releasenotes/notes/fix-sriov-neutron-base-3e32bd667886c474.yaml b/releasenotes/notes/fix-sriov-neutron-base-3e32bd667886c474.yaml
new file mode 100644
index 0000000..012a16c
--- /dev/null
+++ b/releasenotes/notes/fix-sriov-neutron-base-3e32bd667886c474.yaml
@@ -0,0 +1,3 @@
+---
+fixes:
+ - Fixes missing neutron base class in sriov