summaryrefslogtreecommitdiffstats
path: root/manifests/profile/base
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-30 15:47:28 +0000
committerGerrit Code Review <review@openstack.org>2017-03-30 15:47:28 +0000
commitfce0cb21a35446461808ea7167a76a8c3b539088 (patch)
tree735c3b9fe1118a82765e2408c536967b492f44fe /manifests/profile/base
parentd5ac7a238517d88b565db75cf03e2050d810c9d0 (diff)
parent2195cd30112ddbd410ba4a622827e765cbdb025e (diff)
Merge "Move neutron profile out of step 4"
Diffstat (limited to 'manifests/profile/base')
-rw-r--r--manifests/profile/base/neutron/bgpvpn.pp5
1 files changed, 3 insertions, 2 deletions
diff --git a/manifests/profile/base/neutron/bgpvpn.pp b/manifests/profile/base/neutron/bgpvpn.pp
index 9fa1d14..d6fdf4e 100644
--- a/manifests/profile/base/neutron/bgpvpn.pp
+++ b/manifests/profile/base/neutron/bgpvpn.pp
@@ -27,10 +27,11 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::neutron::bgpvpn (
- $step = hiera('step'),
+ $step = hiera('step'),
) {
+ include ::tripleo::profile::base::neutron
+
if $step >= 4 {
- include ::tripleo::profile::base::neutron
include ::neutron::services::bgpvpn
}
}