From 7e3a620fa97b0acb91d4d8165a445bfcaf833889 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Wed, 28 Sep 2016 16:03:07 -0500
Subject: [PATCH] Pull get-pip.py from jenkins cache

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
---
 devstack/plugin.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 3b75c2727..c35323d15 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -17,6 +17,7 @@
 NODEPOOL_KEY=$HOME/.ssh/id_nodepool
 NODEPOOL_PUBKEY=$HOME/.ssh/id_nodepool.pub
 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
 # nodepool install will pull it in.
@@ -250,6 +251,11 @@ diskimages:
       DIB_DISABLE_APT_CLEANUP: '1'
       DIB_DEV_USER_AUTHORIZED_KEYS: $NODEPOOL_PUBKEY
 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
     cp /etc/openstack/clouds.yaml /tmp