From 5f5d97b6e759386d0d43f47cdf86f743e0aa660d Mon Sep 17 00:00:00 2001 From: root Date: Wed, 26 Aug 2015 01:29:56 -0700 Subject: [PATCH] Changed SSH_USER to core instead ubuntu, also applied fixes from #11975 --- cluster/aws/coreos/util.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cluster/aws/coreos/util.sh b/cluster/aws/coreos/util.sh index 77ea538df5f21..70763751feb18 100644 --- a/cluster/aws/coreos/util.sh +++ b/cluster/aws/coreos/util.sh @@ -16,7 +16,7 @@ # A library of helper functions for CoreOS. -SSH_USER=ubuntu +SSH_USER=core function detect-minion-image (){ if [[ -z "${KUBE_MINION_IMAGE-}" ]]; then @@ -29,9 +29,6 @@ function detect-minion-image (){ } function generate-minion-user-data() { - i=$1 - # TODO(bakins): Is this actually used? - MINION_PRIVATE_IP=$INTERNAL_IP_BASE.1${i} # this is a bit of a hack. We make all of our "variables" in # our cloud config controlled by env vars from this script @@ -44,7 +41,6 @@ function generate-minion-user-data() { DNS_SERVER_IP=$(yaml-quote ${DNS_SERVER_IP:-}) DNS_DOMAIN=$(yaml-quote ${DNS_DOMAIN:-}) MASTER_IP=$(yaml-quote ${MASTER_INTERNAL_IP}) - MINION_IP=$(yaml-quote ${MINION_PRIVATE_IP}) KUBELET_TOKEN=$(yaml-quote ${KUBELET_TOKEN:-}) KUBE_PROXY_TOKEN=$(yaml-quote ${KUBE_PROXY_TOKEN:-}) KUBE_BEARER_TOKEN=$(yaml-quote ${KUBELET_TOKEN:-})