openstack/deb-python-dcos
Code Issues Proposed changes

Adding version checking to the install script.

Browse Source 
All DCOS clusters currently download the latest `install.sh`. When we introduce backward incompatabilities, this ends up creating a less than ideal user experience. By checking the version of the cluster, we're able to install the correct CLI version for the cluster. This is a somewhat temporary fix and we'll design a more permanent one later.
This commit is contained in:
Thomas Rampelberg
2016-03-09 11:02:37 -08:00
parent 5f4ec360b6
commit b908887a6e
2 changed files with 72 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
bin/install/install-dcos-cli.sh
View File

@@ -81,6 +81,22 @@ check_dcoscli_version()
fi
}
validate_dcos_url()
{
curl -f -k -s ${DCOS_URL} 2>&1 >/dev/null
echo $?
}
get_dcos_environment_version()
{
VER=$(curl -f -k -s ${DCOS_URL}/dcos-metadata/dcos-version.json)
if [ $? -eq 22 ]; then
echo "1.1"
else
echo $VER | python -c 'import json,sys;obj=json.load(sys.stdin);print(obj.get("version", "1.0"))'
fi
}
if [ "$#" -lt 2 ]; then
usage;
exit 1;
@@ -98,6 +114,8 @@ if [[ $VIRTUAL_ENV_PATH =~ \ ]];
fi
DCOS_URL=${ARGS[1]}
hash curl 2>/dev/null || { echo >&2 "Cannot find curl. You may need to install it by following the documentation at https://docs.mesosphere.com/install/cli/#linux. Aborting."; exit 1; }
command -v virtualenv >/dev/null 2>&1 || { echo "Cannot find virtualenv. You may need to install it by following the documentation at https://docs.mesosphere.com/install/cli/#linux. Aborting."; exit 1; }
VIRTUALENV_VERSION=$(virtualenv --version)
@@ -112,13 +130,30 @@ fi
echo "Installing DCOS CLI from PyPI...";
echo "";
if [ "$(validate_dcos_url)" -gt 0 ]; then
echo "dcos-url is invalid. Please double check that the URL is formatted correctly and pointing at a valid cluster."
exit 1
fi
DCOS_ENVIRONMENT_VERSION=$(get_dcos_environment_version)
compare_version()
{
python -c "import distutils.version as v, sys; sys.exit(not (v.LooseVersion('"${DCOS_ENVIRONMENT_VERSION}"') < v.LooseVersion('"${1}"')))"
}
# Let's first setup a virtualenv: we are assuming that the path is absolute
mkdir -p "$VIRTUAL_ENV_PATH"
virtualenv "$VIRTUAL_ENV_PATH"
# Install the DCOS CLI package, using version if set
if [ -z "$DCOS_CLI_VERSION" ]; then
"$VIRTUAL_ENV_PATH/bin/pip" install --quiet "dcoscli"
if $(compare_version 1.6.1); then
"$VIRTUAL_ENV_PATH/bin/pip" install --quiet "dcoscli<0.4.0"
else
"$VIRTUAL_ENV_PATH/bin/pip" install --quiet "dcoscli"
fi
else
"$VIRTUAL_ENV_PATH/bin/pip" install --quiet "dcoscli==$DCOS_CLI_VERSION"
fi

37
bin/install/install-optout-dcos-cli.sh
View File

@@ -81,6 +81,22 @@ check_dcoscli_version()
fi
}
validate_dcos_url()
{
curl -f -k -s ${DCOS_URL} 2>&1 >/dev/null
echo $?
}
get_dcos_environment_version()
{
VER=$(curl -f -k -s ${DCOS_URL}/dcos-metadata/dcos-version.json)
if [ $? -eq 22 ]; then
echo "1.1"
else
echo $VER | python -c 'import json,sys;obj=json.load(sys.stdin);print(obj.get("version", "1.0"))'
fi
}
if [ "$#" -lt 2 ]; then
usage;
exit 1;
@@ -98,6 +114,8 @@ if [[ $VIRTUAL_ENV_PATH =~ \ ]];
fi
DCOS_URL=${ARGS[1]}
hash curl 2>/dev/null || { echo >&2 "Cannot find curl. You may need to install it by following the documentation at https://docs.mesosphere.com/install/cli/#linux. Aborting."; exit 1; }
command -v virtualenv >/dev/null 2>&1 || { echo "Cannot find virtualenv. You may need to install it by following the documentation at https://docs.mesosphere.com/install/cli/#linux. Aborting."; exit 1; }
VIRTUALENV_VERSION=$(virtualenv --version)
@@ -112,13 +130,30 @@ fi
echo "Installing DCOS CLI from PyPI...";
echo "";
if [ "$(validate_dcos_url)" -gt 0 ]; then
echo "dcos-url is invalid. Please double check that the URL is formatted correctly and pointing at a valid cluster."
exit 1
fi
DCOS_ENVIRONMENT_VERSION=$(get_dcos_environment_version)
compare_version()
{
python -c "import distutils.version as v, sys; sys.exit(not (v.LooseVersion('"${DCOS_ENVIRONMENT_VERSION}"') < v.LooseVersion('"${1}"')))"
}
# Let's first setup a virtualenv: we are assuming that the path is absolute
mkdir -p "$VIRTUAL_ENV_PATH"
virtualenv "$VIRTUAL_ENV_PATH"
# Install the DCOS CLI package, using version if set
if [ -z "$DCOS_CLI_VERSION" ]; then
"$VIRTUAL_ENV_PATH/bin/pip" install --quiet "dcoscli"
if $(compare_version 1.6.1); then
"$VIRTUAL_ENV_PATH/bin/pip" install --quiet "dcoscli<0.4.0"
else
"$VIRTUAL_ENV_PATH/bin/pip" install --quiet "dcoscli"
fi
else
"$VIRTUAL_ENV_PATH/bin/pip" install --quiet "dcoscli==$DCOS_CLI_VERSION"
fi