devstack: parametrize openshift version fetching
Up until now the url included version. With this change it will be possible to test with different openshift releases by just changing the openshift binary version variable. Change-Id: Ic40a57a555ced84240b86b389c12bed8da7b79bc Signed-off-by: Antoni Segura Puimedon <celebdor@gmail.com>
This commit is contained in:
parent
7ba64a87da
commit
e4f68578ba
|
@ -711,7 +711,13 @@ EOF
|
|||
# installs it in the system
|
||||
function install_openshift_binary {
|
||||
mkdir -p "$OPENSHIFT_BIN"
|
||||
curl -L "$OPENSHIFT_BINARY_URL" -o "${OPENSHIFT_BIN}/openshift.tar.gz" --retry 2
|
||||
|
||||
curl -L ${OPENSHIFT_BINARY_BASE_URL}/${OPENSHIFT_BINARY_VERSION}/CHECKSUM --silent | \
|
||||
awk -v "ver=${OPENSHIFT_BINARY_VERSION}" \
|
||||
-v "dest=${OPENSHIFT_BIN}/openshift.tar.gz" \
|
||||
-v "baseurl=${OPENSHIFT_BINARY_BASE_URL}" \
|
||||
'/server/ {system("curl -L " baseurl "/" ver "/" $2 " --retry 2 -o " dest)}'
|
||||
|
||||
tar xzvf "${OPENSHIFT_BIN}/openshift.tar.gz" --strip 1 -C "$OPENSHIFT_BIN"
|
||||
|
||||
# Make openshift run from its untarred directory
|
||||
|
|
|
@ -46,7 +46,8 @@ KURYR_SG_DRIVER=${KURYR_SG_DRIVER:-default}
|
|||
KURYR_ENABLED_HANDLERS=${KURYR_ENABLED_HANDLERS:-vif,lb,lbaasspec}
|
||||
|
||||
# OpenShift
|
||||
OPENSHIFT_BINARY_URL=${OPENSHIFT_BINARY_URL:-https://github.com/openshift/origin/releases/download/v3.9.0/openshift-origin-server-v3.9.0-191fece-linux-64bit.tar.gz}
|
||||
OPENSHIFT_BINARY_VERSION=${OPENSHIFT_BINARY_VERSION:-v3.9.0}
|
||||
OPENSHIFT_BINARY_BASE_URL=${OPENSHIFT_BINARY_BASE_URL:-https://github.com/openshift/origin/releases/download}
|
||||
OPENSHIFT_DATA_DIR=${OPENSHIFT_DATA_DIR:-${DATA_DIR}/openshift}
|
||||
OPENSHIFT_BIN=${OPENSHIFT_BIN:-${OPENSHIFT_DATA_DIR}/bin}
|
||||
OPENSHIFT_API_PORT=${OPENSHIFT_API_PORT:-8443}
|
||||
|
|
Loading…
Reference in New Issue