From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 9 Aug 2016 18:12:12 +0000 (+0000)
Subject: Merge "Only db-sync sahara is included in the bootstrapnode"
X-Git-Tag: opnfv-6.0.0~636
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9968f0b954fcc1a25582c76c80f9440ed65dec85;p=apex-puppet-tripleo.git

Merge "Only db-sync sahara is included in the bootstrapnode"
---

9968f0b954fcc1a25582c76c80f9440ed65dec85
diff --cc manifests/profile/base/sahara/api.pp
index df6c4c9,27e0390..1ead106
--- a/manifests/profile/base/sahara/api.pp
+++ b/manifests/profile/base/sahara/api.pp
@@@ -24,10 -24,11 +24,11 @@@
  #   Defaults to hiera('step')
  #
  class tripleo::profile::base::sahara::api (
 -  $step                    = hiera('step'),
 +  $step = hiera('step'),
  ) {
+   include ::tripleo::profile::base::sahara
+ 
    if $step >= 4 {
-     include ::tripleo::profile::base::sahara
      include ::sahara::service::api
    }
  }