aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-05 13:15:37 +0000
committerGerrit Code Review <review@openstack.org>2016-08-05 13:15:37 +0000
commitfa5bbd7e0df37d7b288f56cb67efbfc7b485ab52 (patch)
tree7dc1b4ab11e7f60291fd6971ee0fa3068e692343
parentdca56361fc99d8b8ceb8ebca154ec1d9228ce748 (diff)
parent6121afcc41fc6e18e39525a0ef24c8349e14f183 (diff)
Merge "Fix mistral profile steps"
-rw-r--r--manifests/profile/base/mistral.pp26
-rw-r--r--manifests/profile/base/mistral/api.pp13
-rw-r--r--manifests/profile/base/mistral/engine.pp23
-rw-r--r--manifests/profile/base/mistral/executor.pp14
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
}