scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add configuration for swift container name

Browse Source 
Fixes Issue #47966
This commit is contained in:
Chris Hoge
2017-06-29 09:33:05 -07:00
parent 33fc75e223
commit c0621061c8
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/openstack-heat/config-default.sh
View File

@@ -43,6 +43,9 @@ CLUSTER_IP_RANGE=${CLUSTER_IP_RANGE:-10.244.0.0/16}
SWIFT_SERVER_URL=${SWIFT_SERVER_URL:-} SWIFT_SERVER_URL=${SWIFT_SERVER_URL:-}
# The name of the object store container to use
SWIFT_OBJECT_STORE=${SWIFT_OBJECT_STORE:-kubernetes}
# Flag indicates if new image must be created. If 'false' then image with IMAGE_ID will be used. # Flag indicates if new image must be created. If 'false' then image with IMAGE_ID will be used.
# If 'true' then new image will be created from file config-image.sh # If 'true' then new image will be created from file config-image.sh
CREATE_IMAGE=${CREATE_IMAGE:-true} # use "true" for devstack CREATE_IMAGE=${CREATE_IMAGE:-true} # use "true" for devstack

8
cluster/openstack-heat/util.sh
View File

@@ -108,7 +108,7 @@ function create-stack() {
# ROOT # ROOT
# KUBERNETES_RELEASE_TAR # KUBERNETES_RELEASE_TAR
function upload-resources() { function upload-resources() {
swift post kubernetes --read-acl '.r:*,.rlistings' swift post ${SWIFT_OBJECT_STORE} --read-acl '.r:*,.rlistings'
locations=( locations=(
"${ROOT}/../../_output/release-tars/${KUBERNETES_RELEASE_TAR}" "${ROOT}/../../_output/release-tars/${KUBERNETES_RELEASE_TAR}"
@@ -119,11 +119,11 @@ function upload-resources() {
RELEASE_TAR_PATH=$(dirname ${RELEASE_TAR_LOCATION}) RELEASE_TAR_PATH=$(dirname ${RELEASE_TAR_LOCATION})
echo "[INFO] Uploading ${KUBERNETES_RELEASE_TAR}" echo "[INFO] Uploading ${KUBERNETES_RELEASE_TAR}"
swift upload kubernetes ${RELEASE_TAR_PATH}/${KUBERNETES_RELEASE_TAR} \ swift upload ${SWIFT_OBJECT_STORE} ${RELEASE_TAR_PATH}/${KUBERNETES_RELEASE_TAR} \
--object-name kubernetes-server.tar.gz --object-name kubernetes-server.tar.gz
echo "[INFO] Uploading kubernetes-salt.tar.gz" echo "[INFO] Uploading kubernetes-salt.tar.gz"
swift upload kubernetes ${RELEASE_TAR_PATH}/kubernetes-salt.tar.gz \ swift upload ${SWIFT_OBJECT_STORE} ${RELEASE_TAR_PATH}/kubernetes-salt.tar.gz \
--object-name kubernetes-salt.tar.gz --object-name kubernetes-salt.tar.gz
} }
@@ -196,7 +196,7 @@ function run-heat-script() {
fi fi
SWIFT_SERVER_URL=$(openstack catalog show object-store --format value | egrep -o "$rgx" | cut -d" " -f2 | head -n 1) SWIFT_SERVER_URL=$(openstack catalog show object-store --format value | egrep -o "$rgx" | cut -d" " -f2 | head -n 1)
fi fi
local swift_repo_url="${SWIFT_SERVER_URL}/kubernetes" local swift_repo_url="${SWIFT_SERVER_URL}/${SWIFT_OBJECT_STORE}"
if [ $CREATE_IMAGE = true ]; then if [ $CREATE_IMAGE = true ]; then
echo "[INFO] Retrieve new image ID" echo "[INFO] Retrieve new image ID"