Merge pull request #5352 from zmerlynn/conditional_disk

Don't always run mount-master-pd
kubernetes · Mar 12, 2015 · bc65568 · bc65568
2 parents 32fbce0 + d4f06ce
commit bc65568
Showing 1 changed file with 5 additions and 1 deletion.
diff --git 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