echo '---> Pre-installing yum and pip packages'
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})
wget https://bootstrap.pypa.io/get-pip.py
python get-pip.py
pip install -c requirements/upper-constraints.txt -r ${proj}/test-requirements.txt
done
-# the ocata release has ovs 2.6.1
-echo '---> Installing openvswitch from openstack Ocata repo (2.6.1)'
-yum install -y http://rdoproject.org/repos/openstack-ocata/rdo-release-ocata.rpm
+echo '---> Installing openvswitch from relevant openstack branch'
+yum install -y centos-release-openstack-${branch_name}
yum install -y --nogpgcheck openvswitch