From a6b40d102e24134a3e5e99a63bd3636aebc2145a Mon Sep 17 00:00:00 2001
From: Damien Ciabrini <dciabrin@redhat.com>
Date: Thu, 13 Apr 2017 08:51:39 +0200
Subject: [PATCH] galera: fix master target during promotion with
 cluster_host_map

When option cluster_host_map is in use, it is assumed that galera node
names map to pacemaker node names _because_ those galera names are not
part of the pacemaker cluster in the first place.

This is not always the case (e.g. when using pacemaker bundles), so
fix accordingly.
---
 heartbeat/galera | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/heartbeat/galera b/heartbeat/galera
index 475a8ba..32c4222 100755
--- a/heartbeat/galera
+++ b/heartbeat/galera
@@ -415,6 +415,13 @@ promote_everyone()
 {
 
     for node in $(echo "$OCF_RESKEY_wsrep_cluster_address" | sed 's/gcomm:\/\///g' | tr -d ' ' | tr -s ',' ' '); do
+        local pcmk_node=$(galera_to_pcmk_name $node)
+        if [ -z "$pcmk_node" ]; then
+            ocf_log err "Could not determine pacemaker node from galera name <${node}>."
+            return
+        else
+            node=$pcmk_node
+        fi
 
         set_master_score $node
     done
@@ -463,7 +470,7 @@ detect_first_master()
     best_node_gcomm=$(echo "$all_nodes" | sed 's/^.* \(.*\)$/\1/')
     best_node=$(galera_to_pcmk_name $best_node_gcomm)
     if [ -z "$best_node" ]; then
-        ocf_log error "Could not determine initial best node from galera name <${best_node_gcomm}>."
+        ocf_log err "Could not determine initial best node from galera name <${best_node_gcomm}>."
         return
     fi
 
@@ -471,7 +478,7 @@ detect_first_master()
     for node in $all_nodes; do
         local pcmk_node=$(galera_to_pcmk_name $node)
         if [ -z "$pcmk_node" ]; then
-            ocf_log error "Could not determine pacemaker node from galera name <${node}>."
+            ocf_log err "Could not determine pacemaker node from galera name <${node}>."
             return
         else
             node=$pcmk_node