From 27cae5160a94130fddbd82c68d40455da3a6bb51 Mon Sep 17 00:00:00 2001
From: Vladimir Kuklin <vkuklin@mirantis.com>
Date: Tue, 27 Nov 2012 18:17:43 +0400
Subject: [PATCH] galera: set wait_prim to true and bootstrap master node

---
 deployment/puppet/galera/manifests/init.pp       | 12 ++++++++++++
 deployment/puppet/galera/templates/wsrep.cnf.erb |  5 ++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/deployment/puppet/galera/manifests/init.pp b/deployment/puppet/galera/manifests/init.pp
index 7f52cf0f83..5afe99445b 100644
--- a/deployment/puppet/galera/manifests/init.pp
+++ b/deployment/puppet/galera/manifests/init.pp
@@ -228,4 +228,16 @@ class galera($cluster_name, $master_ip = false, $node_address = $ipaddress_eth0,
     tries       => 6,
   }
 
+  if ! $master_ip
+  {
+    exec { "bootstrap-galera" :
+      require     => [Service['mysql-galera']],
+      subscribe    => [Service['mysql-galera']],
+      before => [Exec['wait-for-synced-state']],
+      logoutput   => true,
+      command     => "/usr/bin/mysql -Nbe \"SET GLOBAL wsrep_provider_options='pc.bootstrap=1'\"",
+    }
+  }
+
+
 }
diff --git a/deployment/puppet/galera/templates/wsrep.cnf.erb b/deployment/puppet/galera/templates/wsrep.cnf.erb
index bd30bf89d8..fd63ed783d 100644
--- a/deployment/puppet/galera/templates/wsrep.cnf.erb
+++ b/deployment/puppet/galera/templates/wsrep.cnf.erb
@@ -44,12 +44,15 @@ wsrep_provider=<%= libgalera_prefix %>/galera/libgalera_smm.so
 # Provider specific configuration options
 
 # See http://www.codership.com/wiki/doku.php?id=faq
+
+
+
 wsrep_provider_options="pc.ignore_sb = no"
 
 # Logical cluster name. Should be the same for all nodes.
 wsrep_cluster_name="<%= cluster_name -%>"
 <% if setup_multiple_gcomm -%>
-        wsrep_cluster_address="gcomm://<%= @node_addresses.collect {|ip| ip + ':' + 4567 }.join ',' %>"
+        wsrep_cluster_address="gcomm://<%= @node_addresses.collect {|ip| ip + ':' + 4567 }.join ',' %>?pc.wait_prim=yes"
 <% else -%>
     <% if master_ip -%>
         wsrep_cluster_address="gcomm://<%= master_ip %>:4567"