From 355547c5e83d74b90187552b309154659e4a8139 Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente@redhat.com>
Date: Mon, 8 Aug 2016 13:32:33 +0200
Subject: Fix use of bootstrap_node in cinder base profile

By inspecting bootstrap_nodeid in cinder base profile we can
set sync_db appropriately and not always default to true.

Change-Id: I2484b1d70a17436c0d8eab9ea8df927d57783784
---
 manifests/profile/base/cinder.pp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'manifests/profile/base/cinder.pp')

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
   }
-- 
cgit 1.2.3-korg