openstack/openstack-ansible
Code Issues Proposed changes

Improve get-pip.py reliability

Browse Source 
Currently the output from curl is redirected to a file,
regardless of whether the request succeeded or not.

This patch adds:

--output
to direct the output to a file without using bash
redirection

--fail
to ensure that curl returns a non-zero error code if
the request returns a 503

Change-Id: Ic811d89fb6e73d341dfe6238f965b0b873307aff
(cherry picked from commit fcbb63dc88)
This commit is contained in:
Jesse Pretorius 2018-09-14 16:48:22 -06:00 committed by Jesse Pretorius (odyssey4me)
parent 36f250cb3b
commit fd2f98500d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/scripts-library.sh
View File

@ -321,15 +321,15 @@ function get_pip {
GETPIP_PYTHON_EXEC_PATH="${1:-$(which python)}"
# Download the get-pip script using the primary or secondary URL
GETPIP_CMD="curl --silent --show-error --retry 5"
GETPIP_FILE="/opt/get-pip.py"
GETPIP_CMD="curl --fail --silent --show-error --retry 5 --output ${GETPIP_FILE}"
# If GET_PIP_URL is set, then just use it
if [ -n "${GET_PIP_URL:-}" ]; then
${GETPIP_CMD} ${GET_PIP_URL} > ${GETPIP_FILE}
${GETPIP_CMD} ${GET_PIP_URL}
else
# Otherwise, try the two standard URL's
${GETPIP_CMD} https://bootstrap.pypa.io/3.3/get-pip.py > ${GETPIP_FILE}\
|| ${GETPIP_CMD} https://raw.githubusercontent.com/pypa/get-pip/master/3.3/get-pip.py > ${GETPIP_FILE}
${GETPIP_CMD} https://bootstrap.pypa.io/3.3/get-pip.py \
|| ${GETPIP_CMD} https://raw.githubusercontent.com/pypa/get-pip/master/3.3/get-pip.py
fi
${GETPIP_PYTHON_EXEC_PATH} ${GETPIP_FILE} \