From 4db5b6f465a3358a0416377971ef21dec90c75e4 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Thu, 11 Jun 2015 13:01:17 -0400 Subject: [PATCH] AWS: Don't change the default OS It may be that we should change the default, but that is a big move, late in the day, and it warrants its own discussion. --- cluster/aws/config-default.sh | 2 +- cluster/aws/config-test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh index 3ddecf22737..b63ec1628c8 100644 --- a/cluster/aws/config-default.sh +++ b/cluster/aws/config-default.sh @@ -87,7 +87,7 @@ ADMISSION_CONTROL=NamespaceLifecycle,NamespaceExists,LimitRanger,SecurityContext ENABLE_MINION_PUBLIC_IP=${KUBE_ENABLE_MINION_PUBLIC_IP:-true} # OS options for minions -KUBE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION:-wheezy}" +KUBE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION:-ubuntu}" KUBE_MINION_IMAGE="${KUBE_MINION_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 7f34885f357..3ddf633cf8f 100755 --- a/cluster/aws/config-test.sh +++ b/cluster/aws/config-test.sh @@ -84,7 +84,7 @@ ADMISSION_CONTROL=NamespaceLifecycle,NamespaceExists,LimitRanger,SecurityContext ENABLE_MINION_PUBLIC_IP=${KUBE_ENABLE_MINION_PUBLIC_IP:-true} # OS options for minions -KUBE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION:-wheezy}" +KUBE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION:-ubuntu}" KUBE_MINION_IMAGE="${KUBE_MINION_IMAGE:-}" COREOS_CHANNEL="${COREOS_CHANNEL:-alpha}" CONTAINER_RUNTIME="${KUBE_CONTAINER_RUNTIME:-docker}"