From 7179f5f004a3467835edaa831b66e8c6455ab9ed Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Fri, 27 Mar 2015 08:53:17 -0700
Subject: [PATCH] Change AWS_ZONE to ZONE, for compatibility with e2e tests

---
 cluster/aws/config-default.sh        | 2 +-
 cluster/aws/config-test.sh           | 2 +-
 cluster/aws/options.md               | 2 +-
 cluster/aws/templates/salt-master.sh | 2 +-
 cluster/aws/util.sh                  | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh
index 0c18ed124bf..4789633b1b0 100644
--- a/cluster/aws/config-default.sh
+++ b/cluster/aws/config-default.sh
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-AWS_ZONE=${KUBE_AWS_ZONE:-us-west-2a}
+ZONE=${KUBE_AWS_ZONE:-us-west-2a}
 MASTER_SIZE=${MASTER_SIZE:-t2.micro}
 MINION_SIZE=${MINION_SIZE:-t2.micro}
 NUM_MINIONS=${NUM_MINIONS:-4}
diff --git a/cluster/aws/config-test.sh b/cluster/aws/config-test.sh
index 27a50b2ef87..552178c52c1 100755
--- a/cluster/aws/config-test.sh
+++ b/cluster/aws/config-test.sh
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-AWS_ZONE=${KUBE_AWS_ZONE:-us-west-2a}
+ZONE=${KUBE_AWS_ZONE:-us-west-2a}
 MASTER_SIZE=${MASTER_SIZE:-t2.micro}
 MINION_SIZE=${MINION_SIZE:-t2.micro}
 NUM_MINIONS=${NUM_MINIONS:-2}
diff --git a/cluster/aws/options.md b/cluster/aws/options.md
index 513af1f339d..421798728bb 100644
--- a/cluster/aws/options.md
+++ b/cluster/aws/options.md
@@ -5,7 +5,7 @@ specific to AWS are documented in this file, for cross-provider options see TODO
 
 This is a work-in-progress; not all options are documented yet!
 
-## KUBE_AWS_ZONE
+## ZONE
 
 The AWS availability to deploy to.  Defaults to us-west-2a.
 
diff --git a/cluster/aws/templates/salt-master.sh b/cluster/aws/templates/salt-master.sh
index 258a9e64bbe..fd3c51dc3fa 100755
--- a/cluster/aws/templates/salt-master.sh
+++ b/cluster/aws/templates/salt-master.sh
@@ -28,7 +28,7 @@ EOF
 
 cat <<EOF > /etc/aws.conf
 [Global]
-Zone = ${AWS_ZONE}
+Zone = ${ZONE}
 EOF
 
 # Auto accept all keys from minions that try to join
diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh
index 85be47073bb..fba8cf495b6 100644
--- a/cluster/aws/util.sh
+++ b/cluster/aws/util.sh
@@ -22,7 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
 source "${KUBE_ROOT}/cluster/aws/${KUBE_CONFIG_FILE-"config-default.sh"}"
 
 # This removes the final character in bash (somehow)
-AWS_REGION=${AWS_ZONE%?}
+AWS_REGION=${ZONE%?}
 
 export AWS_DEFAULT_REGION=${AWS_REGION}
 AWS_CMD="aws --output json ec2"
@@ -431,7 +431,7 @@ function kube-up {
     echo "readonly NODE_INSTANCE_PREFIX='${INSTANCE_PREFIX}-minion'"
     echo "readonly SERVER_BINARY_TAR_URL='${SERVER_BINARY_TAR_URL}'"
     echo "readonly SALT_TAR_URL='${SALT_TAR_URL}'"
-    echo "readonly AWS_ZONE='${AWS_ZONE}'"
+    echo "readonly ZONE='${ZONE}'"
     echo "readonly MASTER_HTPASSWD='${htpasswd}'"
     echo "readonly PORTAL_NET='${PORTAL_NET}'"
     echo "readonly ENABLE_CLUSTER_MONITORING='${ENABLE_CLUSTER_MONITORING:-false}'"