X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=packer%2Fprovision%2Fdevstack-pre-pip.sh;h=3e129f80c07bede1990ba736578c95cdf76518e3;hb=dc2fa7ae98d7c71d0da377b90fcb0a4797f8d92a;hp=5153a4a6d5c2d6279a746b311da5fea0ce391d1e;hpb=fdc5c15531bbb17616b9dcb2fd43aed4f3eb498b;p=releng%2Fbuilder.git

diff --git a/packer/provision/devstack-pre-pip.sh b/packer/provision/devstack-pre-pip.sh
index 5153a4a6d..3e129f80c 100644
--- a/packer/provision/devstack-pre-pip.sh
+++ b/packer/provision/devstack-pre-pip.sh
@@ -25,33 +25,46 @@ projs="requirements keystone glance cinder neutron nova horizon"
 # shellcheck disable=SC2154
 branch=${os_branch}
 # strip the "stable" off of the branch
-branch_name=$(cut -d'/' -f2 <<< ${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
 
 git clone https://github.com/openstack-dev/devstack.git
-(cd devstack && git checkout ${branch})
+(cd devstack && git checkout "${branch}")
 sed -e 's/#.*//' devstack/files/rpms/general | xargs yum install -y
 
 base_url=https://github.com/openstack/
 for proj in $projs
 do
-    git clone ${base_url}${proj}
-    (cd ${proj} && git checkout ${branch})
-    pip install -c requirements/upper-constraints.txt -e ${proj}
-    pip install -c requirements/upper-constraints.txt -r ${proj}/test-requirements.txt
+    git clone "${base_url}${proj}"
+    (cd "${proj}" && git checkout "${branch}")
+    pip install -c requirements/upper-constraints.txt -e "${proj}"
+    pip install -c requirements/upper-constraints.txt -r "${proj}/test-requirements.txt"
 done
 
 echo '---> Installing openvswitch from relevant openstack branch'
-yum install -y centos-release-openstack-${branch_name}
+yum install -y "centos-release-openstack-${branch_name}"
 
-yum install -y --nogpgcheck openvswitch
-
-cd $OLDPWD
+# 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.
+yum repolist
+yum --showduplicates list openvswitch
+if [ "${branch}" == "stable/queens" ]; then
+    yum install -y --nogpgcheck openvswitch-2.8.2-1.el7
+else
+    yum install -y --nogpgcheck openvswitch
+fi
+cd "$OLDPWD"
 rm -fr tmp
 
 # vim: sw=4 ts=4 sts=4 et :