X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=packer%2Fprovision%2Fdevstack-pre-pip.sh;h=f77336fab666ec9748b38c982254c42fc7c3e913;hb=e209473541a60b878457d4be025983d6337baeb6;hp=43788d77f2c279f9e25a3321dd7c3023a84b1dcd;hpb=f4b9f7257925bb9a3da2a9fedda0dfe4fbc5b2db;p=releng%2Fbuilder.git

diff --git a/packer/provision/devstack-pre-pip.sh b/packer/provision/devstack-pre-pip.sh
index 43788d77f..f77336fab 100644
--- 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
@@ -61,7 +54,14 @@ done
 echo '---> Installing openvswitch from relevant openstack branch'
 yum install -y "centos-release-openstack-${branch_name}"
 
-yum install -y --nogpgcheck openvswitch
+# install 2.8.2 for queens.
+# 2.9.0 is the current version in openstack-queens, but it is buggy.
+# Remove this when https://review.rdoproject.org/r/#/c/13839/ merges and 2.9.2 is in the repo.
+if [ "${branch}" == "stable/queens" ]; then
+    yum install -y --nogpgcheck openvswitch-1:2.8.2
+else
+    yum install -y --nogpgcheck openvswitch
+fi
 
 cd "$OLDPWD"
 rm -fr tmp