zuul/nodepool
Code Issues Proposed changes

Pull get-pip.py from jenkins cache

Browse Source 
The nodepool dib builds have been failing to fetch get-pip.py from
bootstrap.pypa.io. BUT - we have it cached, so let's use that.

Change-Id: I564f647be2fb3bc6b4b8e1e645b2c205c7f3d731
This commit is contained in:
Monty Taylor 2016-09-28 16:03:07 -05:00 committed by Clark Boylan
parent 3148a07e6b
commit 7e3a620fa9
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/plugin.sh
View File

@ -17,6 +17,7 @@
NODEPOOL_KEY=$HOME/.ssh/id_nodepool NODEPOOL_KEY=$HOME/.ssh/id_nodepool
NODEPOOL_PUBKEY=$HOME/.ssh/id_nodepool.pub NODEPOOL_PUBKEY=$HOME/.ssh/id_nodepool.pub
NODEPOOL_INSTALL=$HOME/nodepool-venv NODEPOOL_INSTALL=$HOME/nodepool-venv
NODEPOOL_CACHE_GET_PIP=/opt/stack/cache/files/get-pip.py
# Install shade from git if requested. If not requested # Install shade from git if requested. If not requested
# nodepool install will pull it in. # nodepool install will pull it in.
@ -250,6 +251,11 @@ diskimages:
DIB_DISABLE_APT_CLEANUP: '1' DIB_DISABLE_APT_CLEANUP: '1'
DIB_DEV_USER_AUTHORIZED_KEYS: $NODEPOOL_PUBKEY DIB_DEV_USER_AUTHORIZED_KEYS: $NODEPOOL_PUBKEY
EOF EOF
if [ -f $NODEPOOL_CACHE_GET_PIP ] ; then
cat >> /tmp/nodepool.yaml <<EOF
DIB_REPOLOCATION_pip_and_virtualenv: file://$NODEPOOL_CACHE_GET_PIP
EOF
fi
sudo mv /tmp/nodepool.yaml $NODEPOOL_CONFIG sudo mv /tmp/nodepool.yaml $NODEPOOL_CONFIG
cp /etc/openstack/clouds.yaml /tmp cp /etc/openstack/clouds.yaml /tmp