From 49da8298c9fe77f28243b082f0b77ef5bffd4293 Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Fri, 22 Jul 2016 00:43:30 -0400
Subject: [PATCH] AWS kube-up: fix MASTER_OS_DISTRIBUTION

On AWS we were defining KUBE_MASTER_OS_DISTRIBUTION, but the scripts
expect MASTER_OS_DISTRIBUTION.

Fixes #29422
---
 cluster/aws/config-default.sh | 4 ++--
 cluster/aws/config-test.sh    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh
index d9709919b6f..5734cda55bd 100644
--- a/cluster/aws/config-default.sh
+++ b/cluster/aws/config-default.sh
@@ -143,8 +143,8 @@ ENABLE_NODE_PUBLIC_IP=${KUBE_ENABLE_NODE_PUBLIC_IP:-true}
 
 # OS options for minions
 KUBE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION:-jessie}"
-KUBE_MASTER_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION}"
-KUBE_NODE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION}"
+MASTER_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION}"
+NODE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION}"
 KUBE_NODE_IMAGE="${KUBE_NODE_IMAGE:-}"
 COREOS_CHANNEL="${COREOS_CHANNEL:-alpha}"
 CONTAINER_RUNTIME="${KUBE_CONTAINER_RUNTIME:-docker}"
diff --git a/cluster/aws/config-test.sh b/cluster/aws/config-test.sh
index 598f055535a..3e0531a9d83 100755
--- a/cluster/aws/config-test.sh
+++ b/cluster/aws/config-test.sh
@@ -129,8 +129,8 @@ ENABLE_NODE_PUBLIC_IP=${KUBE_ENABLE_NODE_PUBLIC_IP:-true}
 
 # OS options for minions
 KUBE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION:-jessie}"
-KUBE_MASTER_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION}"
-KUBE_NODE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION}"
+MASTER_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION}"
+NODE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION}"
 KUBE_NODE_IMAGE="${KUBE_NODE_IMAGE:-}"
 COREOS_CHANNEL="${COREOS_CHANNEL:-alpha}"
 CONTAINER_RUNTIME="${KUBE_CONTAINER_RUNTIME:-docker}"