Merge "Fix mistral profile steps"

4 files changed, 56 insertions, 20 deletions

diff --git a/manifests/profile/base/mistral.pp b/manifests/profile/base/mistral.pp
index 42507b9..c0b0538 100644
--- a/manifests/profile/base/mistral.pp
+++ b/manifests/profile/base/mistral.pp
@@ -18,22 +18,34 @@
 #
 # === Parameters
 #
-# [*sync_db*]
-#   (Optional) Whether to run db sync
-#   Defaults to true
-#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
 #
+# [*bootstrap_node*]
+#   (Optional) The hostname of the node responsible for bootstrapping tasks
+#   Defaults to hiera('bootstrap_nodeid')
+#
 class tripleo::profile::base::mistral (
-  $sync_db = true,
-  $step = hiera('step'),
+  $step           = hiera('step'),
+  $bootstrap_node = hiera('bootstrap_nodeid', undef),
 ) {
 
-  if $step >= 3 {
+  if $::hostname == downcase($bootstrap_node) {
+    $sync_db = true
+  } else {
+    $sync_db = false
+  }
+
+  if $step >= 3 and $sync_db {
+    include ::mistral::db::mysql
+  }
+
+  if $step >= 4 and $sync_db {
     include ::mistral
     include ::mistral::config
+    include ::mistral::client
+    include ::mistral::db::sync
   }
 }
diff --git a/manifests/profile/base/mistral/api.pp b/manifests/profile/base/mistral/api.pp
index b955c8d..38e1e61 100644
--- a/manifests/profile/base/mistral/api.pp
+++ b/manifests/profile/base/mistral/api.pp
@@ -23,13 +23,24 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
+# [*bootstrap_node*]
+#   (Optional) The hostname of the node responsible for bootstrapping tasks
+#   Defaults to hiera('bootstrap_nodeid')
+#
 class tripleo::profile::base::mistral::api (
   $step           = hiera('step'),
+  $bootstrap_node = hiera('bootstrap_nodeid', undef),
 ) {
 
+  if $::hostname == downcase($bootstrap_node) {
+    $sync_db = true
+  } else {
+    $sync_db = false
+  }
+
   include ::tripleo::profile::base::mistral
 
-  if $step >= 4 {
+  if $step >= 4 and $sync_db {
     include ::mistral::api
   }
 }
diff --git a/manifests/profile/base/mistral/engine.pp b/manifests/profile/base/mistral/engine.pp
index 141cbad..dfcbc2c 100644
--- a/manifests/profile/base/mistral/engine.pp
+++ b/manifests/profile/base/mistral/engine.pp
@@ -18,28 +18,29 @@
 #
 # === Parameters
 #
-# [*sync_db*]
-#   (Optional) Whether to run db sync
-#   Defaults to undef
-#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
 #
+# [*bootstrap_node*]
+#   (Optional) The hostname of the node responsible for bootstrapping tasks
+#   Defaults to hiera('bootstrap_nodeid')
+#
 class tripleo::profile::base::mistral::engine (
-  $sync_db        = true,
   $step           = hiera('step'),
+  $bootstrap_node = hiera('bootstrap_nodeid', undef),
 ) {
 
-  include ::tripleo::profile::base::mistral
-
-  if $step >= 3 and $sync_db {
-    include ::mistral::db::mysql
-    include ::mistral::db::sync
+  if $::hostname == downcase($bootstrap_node) {
+    $sync_db = true
+  } else {
+    $sync_db = false
   }
 
-  if $step >= 4 {
+  include ::tripleo::profile::base::mistral
+
+  if $step >= 4 and $sync_db {
     include ::mistral::engine
   }
 
diff --git a/manifests/profile/base/mistral/executor.pp b/manifests/profile/base/mistral/executor.pp
index d7b5776..6f101c8 100644
--- a/manifests/profile/base/mistral/executor.pp
+++ b/manifests/profile/base/mistral/executor.pp
@@ -23,13 +23,25 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
+# [*bootstrap_node*]
+#   (Optional) The hostname of the node responsible for bootstrapping tasks
+#   Defaults to hiera('bootstrap_nodeid')
+#
 class tripleo::profile::base::mistral::executor (
   $step           = hiera('step'),
+  $bootstrap_node = hiera('bootstrap_nodeid', undef),
+
 ) {
 
+  if $::hostname == downcase($bootstrap_node) {
+    $sync_db = true
+  } else {
+    $sync_db = false
+  }
+
   include ::tripleo::profile::base::mistral
 
-  if $step >= 4 {
+  if $step >= 4 and $sync_db {
     include ::mistral::executor
   }