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

diff --cc manifests/profile/base/sahara/api.pp
index df6c4c9,27e0390..1ead106
--- 1/manifests/profile/base/sahara/api.pp
--- 2/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
    }
  }

diff --cc manifests/profile/base/sahara/engine.pp
Simple merge