From d4f06cea9f2323a0de4bb550f52e49cbe31868eb Mon Sep 17 00:00:00 2001
From: Zach Loafman <zml@google.com>
Date: Wed, 11 Mar 2015 19:57:18 -0700
Subject: [PATCH] Don't always run mount-master-pd

---
 cluster/gce/configure-vm.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cluster/gce/configure-vm.sh b/cluster/gce/configure-vm.sh
index 1929a5ba76..9b18221334 100644
--- a/cluster/gce/configure-vm.sh
+++ b/cluster/gce/configure-vm.sh
@@ -151,6 +151,10 @@ stop-salt-minion() {
 # formats an unformatted disk, and mkdir -p will leave a directory be if it
 # already exists.
 mount-master-pd() {
+  # TODO(zmerlynn): GKE is still lagging in master-pd creation
+  if [[ ! -e /dev/disk/by-id/google-master-pd ]]; then
+    return
+  fi
   device_info=$(ls -l /dev/disk/by-id/google-master-pd)
   relative_path=${device_info##* }
   device_path="/dev/disk/by-id/${relative_path}"
@@ -200,7 +204,7 @@ enable_cluster_dns: '$(echo "$ENABLE_CLUSTER_DNS" | sed -e "s/'/''/g")'
 dns_replicas: '$(echo "$DNS_REPLICAS" | sed -e "s/'/''/g")'
 dns_server: '$(echo "$DNS_SERVER_IP" | sed -e "s/'/''/g")'
 dns_domain: '$(echo "$DNS_DOMAIN" | sed -e "s/'/''/g")'
-admission_control: '$(echo "$ADMISSION_CONTROL" | sed -e "s/'/''/g")'  
+admission_control: '$(echo "$ADMISSION_CONTROL" | sed -e "s/'/''/g")'
 EOF
 
   if [[ "${KUBERNETES_MASTER}" == "true" ]]; then