summaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-30 12:51:12 +0000
committerGerrit Code Review <review@openstack.org>2016-06-30 12:51:12 +0000
commit21e14de71ba52208c29d43294b4b5e2d2099a7e1 (patch)
tree971d8faa5ba4aefcb226442beefc895c4df57e97 /manifests
parentc6dafdec4ed04c7af6d85d750119251bbae3b951 (diff)
parentc444b36187faa504ae4d5b09eb22c97b3037e6dd (diff)
Merge "neutron plugins: include neutron base"
Diffstat (limited to 'manifests')
-rw-r--r--manifests/profile/base/neutron/plugins/ml2.pp3
-rw-r--r--manifests/profile/base/neutron/plugins/nuage.pp3
-rw-r--r--manifests/profile/base/neutron/plugins/opencontrail.pp3
-rw-r--r--manifests/profile/base/neutron/plugins/plumgrid.pp3
4 files changed, 11 insertions, 1 deletions
diff --git a/manifests/profile/base/neutron/plugins/ml2.pp b/manifests/profile/base/neutron/plugins/ml2.pp
index b462e1b..04c6244 100644
--- a/manifests/profile/base/neutron/plugins/ml2.pp
+++ b/manifests/profile/base/neutron/plugins/ml2.pp
@@ -37,9 +37,10 @@ class tripleo::profile::base::neutron::plugins::ml2 (
$step = hiera('step'),
) {
+ include ::tripleo::profile::base::neutron
+
if $step >= 4 or ( $step >= 3 and $sync_db ) {
include ::neutron::plugins::ml2
- include ::tripleo::profile::base::neutron
if 'cisco_n1kv' in $mechanism_drivers {
include ::tripleo::profile::base::neutron::n1k
diff --git a/manifests/profile/base/neutron/plugins/nuage.pp b/manifests/profile/base/neutron/plugins/nuage.pp
index 20f93db..5d3661e 100644
--- a/manifests/profile/base/neutron/plugins/nuage.pp
+++ b/manifests/profile/base/neutron/plugins/nuage.pp
@@ -29,6 +29,9 @@ class tripleo::profile::base::neutron::plugins::nuage (
$step = hiera('step'),
$sync_db = true,
) {
+
+ include ::tripleo::profile::base::neutron
+
if $step >= 4 or ( $step >= 3 and $sync_db ) {
include ::neutron::plugins::nuage
}
diff --git a/manifests/profile/base/neutron/plugins/opencontrail.pp b/manifests/profile/base/neutron/plugins/opencontrail.pp
index 1fcb627..96d7421 100644
--- a/manifests/profile/base/neutron/plugins/opencontrail.pp
+++ b/manifests/profile/base/neutron/plugins/opencontrail.pp
@@ -29,6 +29,9 @@ class tripleo::profile::base::neutron::plugins::opencontrail (
$step = hiera('step'),
$sync_db = true,
) {
+
+ include ::tripleo::profile::base::neutron
+
if $step >= 4 or ( $step >= 3 and $sync_db ) {
include ::neutron::plugins::opencontrail
}
diff --git a/manifests/profile/base/neutron/plugins/plumgrid.pp b/manifests/profile/base/neutron/plugins/plumgrid.pp
index 7f645b9..f5cd273 100644
--- a/manifests/profile/base/neutron/plugins/plumgrid.pp
+++ b/manifests/profile/base/neutron/plugins/plumgrid.pp
@@ -31,6 +31,9 @@ class tripleo::profile::base::neutron::plugins::plumgrid (
$step = hiera('step'),
$sync_db = true,
) {
+
+ include ::tripleo::profile::base::neutron
+
if $step >= 4 or ( $step >= 3 and $sync_db ) {
include ::neutron::plugins::plumgrid
}