Merge pull request #13185 from xsamurai/master

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:-})