8 files changed, 28 insertions, 13 deletions
diff --git a/manifests/profile/base/mistral.pp b/manifests/profile/base/mistral.pp
index febbae6..0c41193 100644
--- a/manifests/profile/base/mistral.pp
+++ b/manifests/profile/base/mistral.pp
@@ -41,7 +41,7 @@ class tripleo::profile::base::mistral (
     include ::mistral::db::mysql
   }
 
-  if $step >= 4 and $sync_db {
+  if $step >= 4 or ($step >= 3 and $sync_db) {
     include ::mistral
     include ::mistral::config
     include ::mistral::client
diff --git a/manifests/profile/base/mistral/api.pp b/manifests/profile/base/mistral/api.pp
index aeff788..50708f1 100644
--- a/manifests/profile/base/mistral/api.pp
+++ b/manifests/profile/base/mistral/api.pp
@@ -39,7 +39,7 @@ class tripleo::profile::base::mistral::api (
 
   include ::tripleo::profile::base::mistral
 
-  if $step >= 4 and $sync_db {
+  if $step >= 4 or ($step >= 3 and $sync_db) {
     include ::mistral::api
   }
 }
diff --git a/manifests/profile/base/mistral/engine.pp b/manifests/profile/base/mistral/engine.pp
index cf82237..b2d8864 100644
--- a/manifests/profile/base/mistral/engine.pp
+++ b/manifests/profile/base/mistral/engine.pp
@@ -39,7 +39,7 @@ class tripleo::profile::base::mistral::engine (
 
   include ::tripleo::profile::base::mistral
 
-  if $step >= 4 and $sync_db {
+  if $step >= 4 or ($step >= 3 and $sync_db)  {
     include ::mistral::engine
   }
 
diff --git a/manifests/profile/base/mistral/executor.pp b/manifests/profile/base/mistral/executor.pp
index dd8c642..8e3f2c9 100644
--- a/manifests/profile/base/mistral/executor.pp
+++ b/manifests/profile/base/mistral/executor.pp
@@ -39,7 +39,7 @@ class tripleo::profile::base::mistral::executor (
 
   include ::tripleo::profile::base::mistral
 
-  if $step >= 4 and $sync_db {
+  if $step >= 4 or ($step >= 3 and $sync_db)  {
     include ::mistral::executor
   }
 }
diff --git a/manifests/profile/base/neutron/midonet.pp b/manifests/profile/base/neutron/midonet.pp
index c8f3044..9104cc3 100644
--- a/manifests/profile/base/neutron/midonet.pp
+++ b/manifests/profile/base/neutron/midonet.pp
@@ -36,11 +36,11 @@
 #
 # [*neutron_auth_password*]
 #   (Optional) Password to use for Neutron authentication
-#   Defaults to hiera('neutron::server::auth_password')
+#   Defaults to hiera('neutron::server::password')
 #
 # [*neutron_auth_tenant*]
 #   (Optional) Tenant to use for Neutron authentication
-#   Defaults to hiera('neutron::server::auth_tenant')
+#   Defaults to hiera('neutron::server::project_name')
 #
 # [*step*]
 #   (Optional) The current step of the deployment
@@ -67,8 +67,8 @@ class tripleo::profile::base::neutron::midonet (
   $bind_address          = hiera('neutron::bind_host', ''),
   $keystone_admin_token  = hiera('keystone::admin_token', ''),
   $neutron_api_node_ips  = hiera('neutron_api_node_ips', ''),
-  $neutron_auth_password = hiera('neutron::server::auth_password', ''),
-  $neutron_auth_tenant   = hiera('neutron::server::auth_tenant', ''),
+  $neutron_auth_password = hiera('neutron::server::password', ''),
+  $neutron_auth_tenant   = hiera('neutron::server::project_name', ''),
   $step                  = hiera('step'),
   $vip                   = hiera('public_virtual_ip'),
   $zk_on_controller      = hiera('enable_zookeeper_on_controller', ''),
diff --git a/manifests/profile/base/sahara.pp b/manifests/profile/base/sahara.pp
index befb5d3..96d23a6 100644
--- a/manifests/profile/base/sahara.pp
+++ b/manifests/profile/base/sahara.pp
@@ -18,14 +18,27 @@
 #
 # === Parameters
 #
+# [*bootstrap_node*]
+#   (Optional) The hostname of the node responsible for bootstrapping tasks
+#   Defaults to hiera('bootstrap_nodeid')
+#
 # [*step*]
 #   (Optional) The current step of the deployment
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::sahara (
-  $step = hiera('step'),
+  $bootstrap_node = hiera('bootstrap_nodeid', undef),
+  $step           = hiera('step'),
 ) {
-  if $step >= 4 {
-    include ::sahara
+  if $::hostname == downcase($bootstrap_node) {
+    $sync_db = true
+  } else {
+    $sync_db = false
+  }
+
+  if $step >= 4 or ($step >= 3 and $sync_db){
+    class { '::sahara':
+      sync_db => $sync_db,
+    }
   }
 }
diff --git a/manifests/profile/base/sahara/api.pp b/manifests/profile/base/sahara/api.pp
index df6c4c9..1ead106 100644
--- a/manifests/profile/base/sahara/api.pp
+++ b/manifests/profile/base/sahara/api.pp
@@ -26,8 +26,9 @@
 class tripleo::profile::base::sahara::api (
   $step = hiera('step'),
 ) {
+  include ::tripleo::profile::base::sahara
+
   if $step >= 4 {
-    include ::tripleo::profile::base::sahara
     include ::sahara::service::api
   }
 }
diff --git a/manifests/profile/base/sahara/engine.pp b/manifests/profile/base/sahara/engine.pp
index db5ec51..4dbaa85 100644
--- a/manifests/profile/base/sahara/engine.pp
+++ b/manifests/profile/base/sahara/engine.pp
@@ -37,12 +37,13 @@ class tripleo::profile::base::sahara::engine (
     $sync_db = false
   }
 
+  include ::tripleo::profile::base::sahara
+
   if $step >= 3 and $sync_db {
     include ::sahara::db::mysql
   }
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
-    include ::tripleo::profile::base::sahara
     include ::sahara::service::engine
   }
 }