From 0bfb5ae772ce17b165c4445505b54b9cbcd31f70 Mon Sep 17 00:00:00 2001
From: Ryan Richard <ryanrichard07@gmail.com>
Date: Fri, 17 Oct 2014 18:05:11 -0500
Subject: [PATCH] remove hardcoded cloudfiles path and fix PORTAL_NET

---
 build/common.sh                               | 21 ++++++++++++-------
 .../cloud-config/master-cloud-config.yaml     |  2 +-
 cluster/rackspace/util.sh                     |  5 ++++-
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/build/common.sh b/build/common.sh
index c006adde447..d2df086d453 100644
--- a/build/common.sh
+++ b/build/common.sh
@@ -667,14 +667,18 @@ function kube::release::gcs::copy_release_tarballs() {
 # ---------------------------------------------------------------------------
 # Rackspace Release
 
+function kube::release::rackspace::set_vars() {
+
+  CLOUDFILES_CONTAINER="kubernetes-releases-${OS_USERNAME}"
+  KUBE_RACKSPACE_RELEASE_BUCKET=${CLOUDFILES_CONTAINER}
+  KUBE_RACKSPACE_RELEASE_PREFIX=${KUBE_RACKSPACE_RELEASE_PREFIX-devel/}
+}
+
 function kube::release::rackspace::release() {
 
   [[ ${KUBE_RACKSPACE_UPLOAD_RELEASE-y} =~ ^[yY]$ ]] || return 0
   
-  CLOUDFILES_CONTAINER="kubernetes-releases-${OS_USERNAME}"
-  KUBE_RACKSPACE_RELEASE_BUCKET=${KUBE_RACKSPACE_RELEASE_BUCKET-kubernetes-releases-${OS_USERNAME}}
-  KUBE_RACKSPACE_RELEASE_PREFIX=${KUBE_RACKSPACE_RELEASE_PREFIX-devel/}
-
+  kube::release::rackspace::set_vars
   kube::release::rackspace::verify_prereqs
   kube::release::rackspace::ensure_release_container
   kube::release::rackspace::copy_release_tarballs
@@ -713,9 +717,9 @@ function kube::release::rackspace::ensure_release_container() {
 
   SWIFTLY_CMD="swiftly -A ${OS_AUTH_URL} -U ${OS_USERNAME} -K ${OS_PASSWORD}"
 
-  if ! ${SWIFTLY_CMD} get ${CLOUDFILES_CONTAINER} > /dev/null 2>&1 ; then
-    echo "build/common.sh: Container doesn't exist. Creating container ${CLOUDFILES_CONTAINER}"
-    ${SWIFTLY_CMD} put ${CLOUDFILES_CONTAINER} > /dev/null 2>&1
+  if ! ${SWIFTLY_CMD} get ${KUBE_RACKSPACE_RELEASE_BUCKET} > /dev/null 2>&1 ; then
+    echo "build/common.sh: Container doesn't exist. Creating container ${KUBE_RACKSPACE_RELEASE_BUCKET}"
+    ${SWIFTLY_CMD} put ${KUBE_RACKSPACE_RELEASE_BUCKET} > /dev/null 2>&1
   fi
 }
 
@@ -723,7 +727,8 @@ function kube::release::rackspace::ensure_release_container() {
 function kube::release::rackspace::copy_release_tarballs() {
 
   echo "build/common.sh: Uploading to Cloud Files"
-  ${SWIFTLY_CMD} put -i ${RELEASE_DIR}/kubernetes-server-linux-amd64.tar.gz ${CLOUDFILES_CONTAINER}/devel/kubernetes-server-linux-amd64.tar.gz > /dev/null 2>&1
+  ${SWIFTLY_CMD} put -i ${RELEASE_DIR}/kubernetes-server-linux-amd64.tar.gz \
+  ${KUBE_RACKSPACE_RELEASE_BUCKET}/${KUBE_RACKSPACE_RELEASE_PREFIX}/kubernetes-server-linux-amd64.tar.gz > /dev/null 2>&1
   
   echo "Release pushed."
 }
diff --git a/cluster/rackspace/cloud-config/master-cloud-config.yaml b/cluster/rackspace/cloud-config/master-cloud-config.yaml
index ed8f0dbbedf..477db802f52 100644
--- a/cluster/rackspace/cloud-config/master-cloud-config.yaml
+++ b/cluster/rackspace/cloud-config/master-cloud-config.yaml
@@ -77,7 +77,7 @@ coreos:
         [Service]
         EnvironmentFile=-/run/apiserver/minions.env
         ExecStartPre=/usr/bin/ln -sf /opt/kubernetes/server/bin/apiserver /opt/bin/apiserver
-        ExecStart=/opt/bin/apiserver --address=127.0.0.1 --port=8080 --machines=${MINIONS} --etcd_servers=http://127.0.0.1:4001 --portal_net="PORTAL_NET" --logtostderr=true
+        ExecStart=/opt/bin/apiserver --address=127.0.0.1 --port=8080 --machines=${MINIONS} --etcd_servers=http://127.0.0.1:4001 --portal_net=PORTAL_NET --logtostderr=true
         Restart=always
         RestartSec=2
     - name: master-apiserver-sighup.path
diff --git a/cluster/rackspace/util.sh b/cluster/rackspace/util.sh
index 8952d1e76d0..f814cdf7085 100644
--- a/cluster/rackspace/util.sh
+++ b/cluster/rackspace/util.sh
@@ -20,6 +20,7 @@
 # config-default.sh.
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
 source $(dirname ${BASH_SOURCE})/${KUBE_CONFIG_FILE-"config-default.sh"}
+source $KUBE_ROOT/build/common.sh
 
 verify-prereqs() {
   # Make sure that prerequisites are installed.
@@ -86,7 +87,9 @@ find-release-tars() {
 # Retrieves a tempurl from cloudfiles to make the release object publicly accessible for 6 hours.
 find-object-url() {
 
-  RELEASE=kubernetes-releases-${OS_USERNAME}/devel/kubernetes-server-linux-amd64.tar.gz
+  kube::release::rackspace::set_vars
+
+  RELEASE=${KUBE_RACKSPACE_RELEASE_BUCKET}/${KUBE_RACKSPACE_RELEASE_PREFIX}/kubernetes-server-linux-amd64.tar.gz
 
   RELEASE_TMP_URL=$(swiftly -A ${OS_AUTH_URL} -U ${OS_USERNAME} -K ${OS_PASSWORD} tempurl GET ${RELEASE})
   echo "cluster/rackspace/util.sh: Object temp URL:"