From: Carlos Camacho <ccamacho@redhat.com>
Date: Mon, 13 Mar 2017 07:51:07 +0000 (+0100)
Subject: Move neutron profile out of step 4
X-Git-Tag: opnfv-6.0.0~283^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2195cd30112ddbd410ba4a622827e765cbdb025e;p=apex-puppet-tripleo.git

Move neutron profile out of step 4

This submission moves the neutron profile
`::tripleo::profile::base::neutron`
our of step 4.

Change-Id: I4d0617b0d7801426ea6827e70f5f31f10bbcc038
---

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