openstack
/
octavia
Code Issues Proposed changes

Merge "Use the infra pypi mirror for DIB" into stable/stein

This commit is contained in:
Zuul 2019-09-05 04:25:43 +00:00 committed by Gerrit Code Review
parent 2f2e9f7f93 1e43a3071b
commit 0834110070
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
devstack/plugin.sh
View File

@ -89,6 +89,21 @@ function build_octavia_worker_image {
export PARAM_OCTAVIA_AMP_IMAGE_SIZE='-s '$OCTAVIA_AMP_IMAGE_SIZE export PARAM_OCTAVIA_AMP_IMAGE_SIZE='-s '$OCTAVIA_AMP_IMAGE_SIZE
fi fi
# Use the infra pypi mirror if it is available
if [[ -e /etc/ci/mirror_info.sh ]]; then
source /etc/ci/mirror_info.sh
fi
if [[ ${NODEPOOL_PYPI_MIRROR:+1} ]]; then
if [[ ${DIB_LOCAL_ELEMENTS:+1} ]]; then
export DIB_LOCAL_ELEMENTS="${DIB_LOCAL_ELEMENTS} pypi"
else
export DIB_LOCAL_ELEMENTS='pypi'
fi
export DIB_PYPI_MIRROR_URL=$NODEPOOL_PYPI_MIRROR
export DIB_PYPI_MIRROR_URL_1=$NODEPOOL_WHEEL_MIRROR
export DIB_PIP_RETRIES=0
fi
if ! [ -f $OCTAVIA_AMP_IMAGE_FILE ]; then if ! [ -f $OCTAVIA_AMP_IMAGE_FILE ]; then
local dib_logs=/var/log/dib-build local dib_logs=/var/log/dib-build
if [[ -e ${dib_logs} ]]; then if [[ -e ${dib_logs} ]]; then