From 68539ae8a4af482ad72ecc3bf40b425a895636de Mon Sep 17 00:00:00 2001
From: Brad Erickson <eosrei@gmail.com>
Date: Mon, 23 Nov 2015 19:00:37 -0800
Subject: [PATCH] Minion->Node rename: KUBE_NODE_IMAGE

---
 cluster/aws/config-default.sh | 2 +-
 cluster/aws/config-test.sh    | 2 +-
 cluster/aws/coreos/util.sh    | 8 ++++----
 cluster/aws/trusty/common.sh  | 4 ++--
 cluster/aws/util.sh           | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh
index 5435239d554..be08d2a787b 100644
--- a/cluster/aws/config-default.sh
+++ b/cluster/aws/config-default.sh
@@ -134,7 +134,7 @@ ENABLE_MINION_PUBLIC_IP=${KUBE_ENABLE_NODE_PUBLIC_IP:-true}
 
 # OS options for minions
 KUBE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION:-vivid}"
-KUBE_MINION_IMAGE="${KUBE_MINION_IMAGE:-}"
+KUBE_NODE_IMAGE="${KUBE_NODE_IMAGE:-}"
 COREOS_CHANNEL="${COREOS_CHANNEL:-alpha}"
 CONTAINER_RUNTIME="${KUBE_CONTAINER_RUNTIME:-docker}"
 RKT_VERSION="${KUBE_RKT_VERSION:-0.5.5}"
diff --git a/cluster/aws/config-test.sh b/cluster/aws/config-test.sh
index 45aa58816eb..5c47ef4c09e 100755
--- a/cluster/aws/config-test.sh
+++ b/cluster/aws/config-test.sh
@@ -130,7 +130,7 @@ ENABLE_MINION_PUBLIC_IP=${KUBE_ENABLE_NODE_PUBLIC_IP:-true}
 
 # OS options for minions
 KUBE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION:-vivid}"
-KUBE_MINION_IMAGE="${KUBE_MINION_IMAGE:-}"
+KUBE_NODE_IMAGE="${KUBE_NODE_IMAGE:-}"
 COREOS_CHANNEL="${COREOS_CHANNEL:-alpha}"
 CONTAINER_RUNTIME="${KUBE_CONTAINER_RUNTIME:-docker}"
 RKT_VERSION="${KUBE_RKT_VERSION:-0.5.5}"
diff --git a/cluster/aws/coreos/util.sh b/cluster/aws/coreos/util.sh
index 70763751feb..c58144bb02c 100644
--- a/cluster/aws/coreos/util.sh
+++ b/cluster/aws/coreos/util.sh
@@ -19,11 +19,11 @@
 SSH_USER=core
 
 function detect-minion-image (){
-  if [[ -z "${KUBE_MINION_IMAGE-}" ]]; then
-    KUBE_MINION_IMAGE=$(curl -s -L http://${COREOS_CHANNEL}.release.core-os.net/amd64-usr/current/coreos_production_ami_all.json | python -c "import json,sys;obj=json.load(sys.stdin);print filter(lambda t: t['name']=='${AWS_REGION}', obj['amis'])[0]['hvm']")
+  if [[ -z "${KUBE_NODE_IMAGE-}" ]]; then
+    KUBE_NODE_IMAGE=$(curl -s -L http://${COREOS_CHANNEL}.release.core-os.net/amd64-usr/current/coreos_production_ami_all.json | python -c "import json,sys;obj=json.load(sys.stdin);print filter(lambda t: t['name']=='${AWS_REGION}', obj['amis'])[0]['hvm']")
   fi
-  if [[ -z "${KUBE_MINION_IMAGE-}" ]]; then
-    echo "unable to determine KUBE_MINION_IMAGE"
+  if [[ -z "${KUBE_NODE_IMAGE-}" ]]; then
+    echo "unable to determine KUBE_NODE_IMAGE"
     exit 2
   fi
 }
diff --git a/cluster/aws/trusty/common.sh b/cluster/aws/trusty/common.sh
index e8b827f4f8c..bfc98b1882b 100644
--- a/cluster/aws/trusty/common.sh
+++ b/cluster/aws/trusty/common.sh
@@ -18,9 +18,9 @@
 # A library of common helper functions for Ubuntus & Debians.
 
 function detect-minion-image() {
-  if [[ -z "${KUBE_MINION_IMAGE=-}" ]]; then
+  if [[ -z "${KUBE_NODE_IMAGE=-}" ]]; then
     detect-image
-    KUBE_MINION_IMAGE=$AWS_IMAGE
+    KUBE_NODE_IMAGE=$AWS_IMAGE
   fi
 }
 
diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh
index 8154897278c..e790e8d9e1b 100755
--- a/cluster/aws/util.sh
+++ b/cluster/aws/util.sh
@@ -997,7 +997,7 @@ function start-minions() {
   fi
   ${AWS_ASG_CMD} create-launch-configuration \
       --launch-configuration-name ${ASG_NAME} \
-      --image-id $KUBE_MINION_IMAGE \
+      --image-id $KUBE_NODE_IMAGE \
       --iam-instance-profile ${IAM_PROFILE_NODE} \
       --instance-type $MINION_SIZE \
       --key-name ${AWS_SSH_KEY_NAME} \