From 62235c3bb87670a618d346a5f4ca0178a80f3289 Mon Sep 17 00:00:00 2001
From: Ryan Hitchman <rmmh@google.com>
Date: Wed, 10 May 2017 12:07:02 -0700
Subject: [PATCH] Fix ip-alias testing.

IP aliases are an alpha feature, and node accelerators are a beta
feature. $gcloud determines which is appropriate.

Before, this would try to run "gcloud alpha beta", which is incoherent.
---
 cluster/gce/util.sh | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
index 5a3f672dc52..c034dc30087 100755
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -505,6 +505,15 @@ function create-node-template() {
   fi
 
   local gcloud="gcloud"
+
+  local accelerator_args=""
+  # VMs with Accelerators cannot be live migrated.
+  # More details here - https://cloud.google.com/compute/docs/gpus/add-gpus#create-new-gpu-instance
+  if [[ ! -z "${NODE_ACCELERATORS}" ]]; then
+    accelerator_args="--maintenance-policy TERMINATE --restart-on-failure --accelerator ${NODE_ACCELERATORS}"
+    gcloud="gcloud beta"
+  fi
+
   if [[ "${ENABLE_IP_ALIASES:-}" == 'true' ]]; then
     gcloud="gcloud alpha"
   fi
@@ -527,16 +536,10 @@ function create-node-template() {
     "${IP_ALIAS_SUBNETWORK:-}" \
     "${IP_ALIAS_SIZE:-}")
 
-  local accelerator_args=""
-  # VMs with Accelerators cannot be live migrated.
-  # More details here - https://cloud.google.com/compute/docs/gpus/add-gpus#create-new-gpu-instance
-  if [[ ! -z "${NODE_ACCELERATORS}" ]]; then
-      accelerator_args="--maintenance-policy TERMINATE --restart-on-failure --accelerator ${NODE_ACCELERATORS}"
-  fi
   local attempt=1
   while true; do
     echo "Attempt ${attempt} to create ${1}" >&2
-    if ! ${gcloud} beta compute instance-templates create \
+    if ! ${gcloud} compute instance-templates create \
       "$template_name" \
       --project "${PROJECT}" \
       --machine-type "${NODE_SIZE}" \