Merge "Fix use of bootstrap_node in cinder base profile"

4 files changed, 19 insertions, 18 deletions

diff --git a/manifests/profile/base/cinder.pp b/manifests/profile/base/cinder.pp
index 8f252d4..43d95b4 100644
--- a/manifests/profile/base/cinder.pp
+++ b/manifests/profile/base/cinder.pp
@@ -18,26 +18,30 @@
 #
 # === Parameters
 #
+# [*bootstrap_node*]
+#   (Optional) The hostname of the node responsible for bootstrapping tasks
+#   Defaults to hiera('bootstrap_nodeid')
+#
 # [*cinder_enable_db_purge*]
 #   (Optional) Wheter to enable db purging
 #   Defaults to true
 #
-# [*pacemaker_master*]
-#   (Optional) The master node runs some tasks
-#   one step earlier than others; disable to
-#   the node is not the master.
-#   Defaults to true
-#
 # [*step*]
 #   (Optional) The current step of the deployment
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::cinder (
+  $bootstrap_node         = hiera('bootstrap_nodeid', undef),
   $cinder_enable_db_purge = true,
-  $pacemaker_master       = true,
   $step                   = hiera('step'),
 ) {
-  if $step >= 4 or ($step >= 3 and $pacemaker_master) {
+  if $::hostname == downcase($bootstrap_node) {
+    $sync_db = true
+  } else {
+    $sync_db = false
+  }
+
+  if $step >= 4 or ($step >= 3 and $sync_db) {
     include ::cinder
     include ::cinder::config
   }
diff --git a/manifests/profile/base/cinder/api.pp b/manifests/profile/base/cinder/api.pp
index e15e112..370b402 100644
--- a/manifests/profile/base/cinder/api.pp
+++ b/manifests/profile/base/cinder/api.pp
@@ -37,9 +37,7 @@ class tripleo::profile::base::cinder::api (
     $sync_db = false
   }
 
-  class { '::tripleo::profile::base::cinder':
-    pacemaker_master => $sync_db,
-  }
+  include ::tripleo::profile::base::cinder
 
   if $step >= 3 and $sync_db {
     include ::cinder::db::mysql
diff --git a/manifests/profile/base/database/mongodbcommon.pp b/manifests/profile/base/database/mongodbcommon.pp
index 756ab85..13af899 100644
--- a/manifests/profile/base/database/mongodbcommon.pp
+++ b/manifests/profile/base/database/mongodbcommon.pp
@@ -31,8 +31,7 @@ class tripleo::profile::base::database::mongodbcommon (
 ) {
   $port = '27017'
 
-  # NOTE(gfidente): the following vars are needed on all nodes so they
-  # need to stay out of pacemaker_master conditional.
+  # NOTE(gfidente): the following vars are needed on all nodes.
   # The addresses mangling will hopefully go away when we'll be able to
   # configure the connection string via hostnames, until then, we need to pass
   # the list of IPv6 addresses *with* port and without the brackets as 'members'
diff --git a/manifests/profile/base/heat.pp b/manifests/profile/base/heat.pp
index 8512d6e..dcf0f21 100644
--- a/manifests/profile/base/heat.pp
+++ b/manifests/profile/base/heat.pp
@@ -18,8 +18,8 @@
 #
 # === Parameters
 #
-# [*bootstrap_master*]
-#   (Optional) The hostname of the node responsible for bootstrapping
+# [*bootstrap_node*]
+#   (Optional) The hostname of the node responsible for bootstrapping tasks
 #   Defaults to downcase(hiera('bootstrap_nodeid'))
 #
 # [*manage_db_purge*]
@@ -36,12 +36,12 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::heat (
-  $bootstrap_master    = downcase(hiera('bootstrap_nodeid')),
+  $bootstrap_node      = downcase(hiera('bootstrap_nodeid')),
   $manage_db_purge     = hiera('heat_enable_db_purge', true),
   $notification_driver = 'messaging',
   $step                = hiera('step'),
 ) {
-  # Domain resources will be created at step5 on the pacemaker_master so we
+  # Domain resources will be created at step5 on the bootstrap_node so we
   # configure heat.conf at step3 and 4 but actually create the domain later.
   if $step == 3 or $step == 4 {
     class { '::heat::keystone::domain':
@@ -62,7 +62,7 @@ class tripleo::profile::base::heat (
     if $manage_db_purge {
       include ::heat::cron::purge_deleted
     }
-    if $bootstrap_master == $::hostname {
+    if $bootstrap_node == $::hostname {
       # Class ::heat::keystone::domain has to run on bootstrap node
       # because it creates DB entities via API calls.
       include ::heat::keystone::domain