Fixes #28205, Check release tar location for Openstack-Heat provider

This does a basic check to see where the release tars are located.

Allows people to use openstack-heat outside of compiling k8s.
pull/6/head
Elson Rodriguez 2016-06-30 20:58:22 -04:00
parent f549570e5d
commit fbd0ba074e
1 changed files with 12 additions and 4 deletions

View File

@ -108,12 +108,20 @@ function create-stack() {
function upload-resources() {
swift post kubernetes --read-acl '.r:*,.rlistings'
echo "[INFO] Upload ${KUBERNETES_RELEASE_TAR}"
swift upload kubernetes ${ROOT}/../../_output/release-tars/${KUBERNETES_RELEASE_TAR} \
locations=(
"${ROOT}/../../_output/release-tars/${KUBERNETES_RELEASE_TAR}"
"${ROOT}/../../server/${KUBERNETES_RELEASE_TAR}"
)
RELEASE_TAR_LOCATION=$( (ls -t "${locations[@]}" 2>/dev/null || true) | head -1 )
RELEASE_TAR_PATH=$(dirname ${RELEASE_TAR_LOCATION})
echo "[INFO] Uploading ${KUBERNETES_RELEASE_TAR}"
swift upload kubernetes ${RELEASE_TAR_PATH}/${KUBERNETES_RELEASE_TAR} \
--object-name kubernetes-server.tar.gz
echo "[INFO] Upload kubernetes-salt.tar.gz"
swift upload kubernetes ${ROOT}/../../_output/release-tars/kubernetes-salt.tar.gz \
echo "[INFO] Uploading kubernetes-salt.tar.gz"
swift upload kubernetes ${RELEASE_TAR_PATH}/kubernetes-salt.tar.gz \
--object-name kubernetes-salt.tar.gz
}