Do not upgrade pip to v10

v10 does not allow uninstalling
distutils installed packages. This fails the openstack pip installs
below when it attempts to uninstall packages.
devstack patch that is trying to get pip 10 working:
https://review.openstack.org/#/c/561597/

Change-Id: I4ad82e97bd73a2b02e87163fcc23dc98a21e886e
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/packer/provision/devstack-pre-pip.sh b/packer/provision/devstack-pre-pip.sh
index 43788d77f2c279f9e25a3321dd7c3023a84b1dcd..821fb38aa11e4d308fc8e763d9785af9d99cbbca 100644 (file)
--- a/packer/provision/devstack-pre-pip.sh
+++ b/packer/provision/devstack-pre-pip.sh
@@ -27,8 +27,13 @@ branch=${os_branch}
 # strip the "stable" off of the branch
 branch_name=$(cut -d'/' -f2 <<< "${branch}")
 
-wget https://bootstrap.pypa.io/get-pip.py
-python get-pip.py
+# Do not upgrade pip to v10. v10 does not allow uninstalling
+# distutils installed packages. This fails the openstack pip installs
+# below when it attempts to uninstall packages.
+# devstack patch that is trying to get pip 10 working:
+# https://review.openstack.org/#/c/561597/
+# wget https://bootstrap.pypa.io/get-pip.py
+# python get-pip.py
 
 mkdir tmp
 cd tmp
@@ -37,18 +42,6 @@ git clone https://github.com/openstack-dev/devstack.git
 (cd devstack && git checkout "${branch}")
 sed -e 's/#.*//' devstack/files/rpms/general | xargs yum install -y
 
-sudo ls -al /usr/lib/py*
-
-sudo rm -rf /usr/lib/python3/dist-packages/yaml
-sudo rm -rf /usr/lib/python3/dist-packages/PyYAML-*
-sudo rm -rf /usr/lib/python3.4/dist-packages/yaml
-sudo rm -rf /usr/lib/python3.4/dist-packages/PyYAML-*
-
-sudo rm -rf /usr/lib/python3/site-packages/yaml
-sudo rm -rf /usr/lib/python3/site-packages/PyYAML-*
-sudo rm -rf /usr/lib/python3.4/site-packages/yaml
-sudo rm -rf /usr/lib/python3.4/site-packages/PyYAML-*
-
 base_url=https://github.com/openstack/
 for proj in $projs
 do