From ef91e2bb313f6bda70f560d572bed2d154f45da4 Mon Sep 17 00:00:00 2001
From: Jerzy Szczepkowski <jsz@google.com>
Date: Tue, 22 Nov 2016 14:27:55 +0100
Subject: [PATCH] HA master, fixed replica name when creating load balancer.

HA master, fixed replica name when creating load balancer. Was broken when replica
w/o suffix is no longer in the cluster.
---
 cluster/gce/util.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
index 9c79c955964..c8a54b0adf7 100755
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -1008,17 +1008,20 @@ function create-loadbalancer() {
     echo "Load balancer already exists"
     return
   fi
-  local EXISTING_MASTER_ZONE=$(gcloud compute instances list "${MASTER_NAME}" \
+
+  local EXISTING_MASTER_NAME="$(get-all-replica-names)"
+  local EXISTING_MASTER_ZONE=$(gcloud compute instances list "${EXISTING_MASTER_NAME}" \
     --project "${PROJECT}" --format="value(zone)")
+
   echo "Creating load balancer in front of an already existing master in ${EXISTING_MASTER_ZONE}"
 
   # Step 1: Detach master IP address and attach ephemeral address to the existing master
-  attach-external-ip ${MASTER_NAME} ${EXISTING_MASTER_ZONE}
+  attach-external-ip "${EXISTING_MASTER_NAME}" "${EXISTING_MASTER_ZONE}"
 
   # Step 2: Create target pool.
   gcloud compute target-pools create "${MASTER_NAME}" --region "${REGION}"
   # TODO: We should also add master instances with suffixes
-  gcloud compute target-pools add-instances ${MASTER_NAME} --instances ${MASTER_NAME} --zone ${EXISTING_MASTER_ZONE}
+  gcloud compute target-pools add-instances "${MASTER_NAME}" --instances "${EXISTING_MASTER_NAME}" --zone "${EXISTING_MASTER_ZONE}"
 
   # Step 3: Create forwarding rule.
   # TODO: This step can take up to 20 min. We need to speed this up...