From 708553f0bbf462da4bfdf99c01b6b04793b2e1b7 Mon Sep 17 00:00:00 2001
From: Zach Loafman <zml@google.com>
Date: Sat, 28 Mar 2015 13:44:45 -0700
Subject: [PATCH] GCE node salt: Use the master FQDN, not the master IP

This will allow us to upgrade the master by full re-provision, without
even bothering to reserve the IP.
---
 cluster/gce/configure-vm.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cluster/gce/configure-vm.sh b/cluster/gce/configure-vm.sh
index 4dfbcdb9ae0ee..a07bd995f7328 100644
--- a/cluster/gce/configure-vm.sh
+++ b/cluster/gce/configure-vm.sh
@@ -324,15 +324,15 @@ EOF
 }
 
 function salt-set-apiserver() {
-  local kube_master_ip
-  until kube_master_ip=$(getent hosts ${KUBERNETES_MASTER_NAME} | cut -f1 -d\ ); do
+  local kube_master_fqdn
+  until kube_master_fqdn=$(getent hosts ${KUBERNETES_MASTER_NAME} | awk '{ print $2 }'); do
     echo 'Waiting for DNS resolution of ${KUBERNETES_MASTER_NAME}...'
     sleep 3
   done
 
   cat <<EOF >>/etc/salt/minion.d/grains.conf
-  api_servers: '${kube_master_ip}'
-  apiservers: '${kube_master_ip}'
+  api_servers: '${kube_master_fqdn}'
+  apiservers: '${kube_master_fqdn}'
 EOF
 }