From 25a33f31c58280671a0546598bbb1842064c0ede Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Mon, 5 May 2014 15:38:25 -0700 Subject: [PATCH] Update get-pip URL to the new location The pypa team has made a new static location for get-pip.py. Instead of downloading from github, we should use this. Change-Id: Ifb7f00447d4a19f20f6413fa7fece5913de092f8 --- install_puppet.sh | 2 +- .../files/nodepool/scripts/cache_devstack.py | 4 +--- modules/openstack_project/files/nodepool/scripts/fix_pip.sh | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/install_puppet.sh b/install_puppet.sh index 685e30d107..c58bad56e3 100755 --- a/install_puppet.sh +++ b/install_puppet.sh @@ -17,7 +17,7 @@ # under the License. # Install pip using get-pip -PIP_GET_PIP_URL=https://raw.githubusercontent.com/pypa/pip/master/contrib/get-pip.py +PIP_GET_PIP_URL=https://bootstrap.pypa.io/get-pip.py curl -O $PIP_GET_PIP_URL || wget $PIP_GET_PIP_URL python get-pip.py diff --git a/modules/openstack_project/files/nodepool/scripts/cache_devstack.py b/modules/openstack_project/files/nodepool/scripts/cache_devstack.py index 5c8a3b6aea..02900ad261 100755 --- a/modules/openstack_project/files/nodepool/scripts/cache_devstack.py +++ b/modules/openstack_project/files/nodepool/scripts/cache_devstack.py @@ -157,9 +157,7 @@ def main(): # cache get-pip, because upstream network connection fails more # often than you might imagine. - download( - 'https://raw.githubusercontent.com/pypa/pip/master/contrib/get-pip.py', - 'get-pip.py') + download('https://bootstrap.pypa.io/get-pip.py', 'get-pip.py') if __name__ == '__main__': diff --git a/modules/openstack_project/files/nodepool/scripts/fix_pip.sh b/modules/openstack_project/files/nodepool/scripts/fix_pip.sh index 84d4596675..019dc54fe8 100755 --- a/modules/openstack_project/files/nodepool/scripts/fix_pip.sh +++ b/modules/openstack_project/files/nodepool/scripts/fix_pip.sh @@ -23,7 +23,7 @@ for p in python-pip python3-pip ; do done # install pip using get-pip -PIP_GET_PIP_URL=https://raw.githubusercontent.com/pypa/pip/master/contrib/get-pip.py +PIP_GET_PIP_URL=https://bootstrap.pypa.io/get-pip.py if [ ! -f get-pip.py ] ; then curl -O $PIP_GET_PIP_URL || wget $PIP_GET_PIP_URL fi