From 75dac16c34b02d32368e622a71c0809db7d3170f Mon Sep 17 00:00:00 2001
From: Ryan Richard <ryanrichard07@gmail.com>
Date: Mon, 4 May 2015 23:44:27 -0700
Subject: [PATCH] leverage $public_ip4 for apiserver communication

---
 .../rackspace/cloud-config/master-cloud-config.yaml    |  2 +-
 .../rackspace/cloud-config/minion-cloud-config.yaml    | 10 +++++-----
 cluster/rackspace/util.sh                              |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cluster/rackspace/cloud-config/master-cloud-config.yaml b/cluster/rackspace/cloud-config/master-cloud-config.yaml
index ae449178f61..6a7214c28c6 100644
--- a/cluster/rackspace/cloud-config/master-cloud-config.yaml
+++ b/cluster/rackspace/cloud-config/master-cloud-config.yaml
@@ -89,7 +89,7 @@ coreos:
         Requires=etcd.service
         After=master-apiserver.service
         [Service]
-        ExecStart=/bin/sh -c 'etcdctl set /corekube/apiservers/$private_ipv4 $private_ipv4'
+        ExecStart=/bin/sh -c 'etcdctl set /corekube/apiservers/$public_ipv4 $public_ipv4'
         Restart=always
         RestartSec=120
     - name: master-controller-manager.service
diff --git a/cluster/rackspace/cloud-config/minion-cloud-config.yaml b/cluster/rackspace/cloud-config/minion-cloud-config.yaml
index c55a63a3ad7..aba5ee0361b 100644
--- a/cluster/rackspace/cloud-config/minion-cloud-config.yaml
+++ b/cluster/rackspace/cloud-config/minion-cloud-config.yaml
@@ -19,7 +19,7 @@ write_files:
       m=$(echo $(etcdctl ls --recursive /corekube/apiservers | cut -d/ -f4 | sort) | tr ' ' ,)
       mkdir -p /run/kubelet
       echo "APISERVER_IPS=$m" > /run/kubelet/apiservers.env
-      echo "FIRST_APISERVER_URL=http://${m%%\,*}:7080" >> /run/kubelet/apiservers.env
+      echo "FIRST_APISERVER_URL=http://${m%%\,*}:6443" >> /run/kubelet/apiservers.env
   - path: /opt/bin/download-release.sh
     permissions: 0755
     content: |
@@ -75,9 +75,9 @@ coreos:
         After=download-release.service
         Requires=download-release.service
         [Service]
-        EnvironmentFile=/run/kubelet/apiserver.env
+        EnvironmentFile=/run/kubelet/apiservers.env
         ExecStartPre=/usr/bin/ln -sf /opt/kubernetes/server/bin/kubelet /opt/bin/kubelet
-        ExecStart=/opt/bin/kubelet --address=$private_ipv4 --hostname_override=$private_ipv4 --api_servers=$FIRST_APISERVER_URL --logtostderr=true --config=/opt/kubernetes-manifests --cluster_dns=DNS_SERVER_IP --cluster_domain=DNS_DOMAIN
+        ExecStart=/opt/bin/kubelet --address=$private_ipv4 --hostname_override=$private_ipv4 --api_servers=${FIRST_APISERVER_URL} --logtostderr=true --config=/opt/kubernetes-manifests --cluster_dns=DNS_SERVER_IP --cluster_domain=DNS_DOMAIN
         Restart=always
         RestartSec=2
     - name: minion-proxy.service
@@ -93,9 +93,9 @@ coreos:
         After=download-release.service
         Requires=download-release.service
         [Service]
-        EnvironmentFile=/run/kubelet/apiserver.env
+        EnvironmentFile=/run/kubelet/apiservers.env
         ExecStartPre=/usr/bin/ln -sf /opt/kubernetes/server/bin/kube-proxy /opt/bin/kube-proxy
-        ExecStart=/opt/bin/kube-proxy --bind_address=$private_ipv4 --master=$FIRST_APISERVER_URL --logtostderr=true
+        ExecStart=/opt/bin/kube-proxy --bind_address=$private_ipv4 --master=${FIRST_APISERVER_URL} --logtostderr=true
         Restart=always
         RestartSec=2
     - name: kubelet-sighup.path
diff --git a/cluster/rackspace/util.sh b/cluster/rackspace/util.sh
index 2f7553fdc78..eff0161e4fb 100644
--- a/cluster/rackspace/util.sh
+++ b/cluster/rackspace/util.sh
@@ -60,7 +60,7 @@ get-password() {
   get-kubeconfig-basicauth
   if [[ -z "${KUBE_USER}" || -z "${KUBE_PASSWORD}" ]]; then
     KUBE_USER=admin
-    KUBE_PASSWORD=$(python -c 'import string,random; print "".join(random.SystemRandom().choice(string.ascii_letters + string.digits) for _ in range(16))')
+    KUBE_PASSWORD=$(python2.7 -c 'import string,random; print "".join(random.SystemRandom().choice(string.ascii_letters + string.digits) for _ in range(16))')
   fi
 }
 
@@ -276,7 +276,7 @@ kube-up() {
   trap "rm -rf ${KUBE_TEMP}" EXIT
 
   get-password
-  python $(dirname $0)/../third_party/htpasswd/htpasswd.py -b -c ${KUBE_TEMP}/htpasswd $KUBE_USER $KUBE_PASSWORD
+  python2.7 $(dirname $0)/../third_party/htpasswd/htpasswd.py -b -c ${KUBE_TEMP}/htpasswd $KUBE_USER $KUBE_PASSWORD
   HTPASSWD=$(cat ${KUBE_TEMP}/htpasswd)
 
   rax-nova-network