Update devstack packer to install OVS 2.6

Change-Id: I631f137e4ccd73a35be80c5a8576ccf3bdd9dc62
Signed-off-by: Alon Kochba <alonko@hpe.com>

diff --git a/packer/provision/devstack-pre-pip.sh b/packer/provision/devstack-pre-pip.sh
index 15827864a096dbc28478d527ddfc78c78a3ca0df..a91d7619d68d843467b6a73d0153f402bf5189e9 100644 (file)
--- a/packer/provision/devstack-pre-pip.sh
+++ b/packer/provision/devstack-pre-pip.sh
@@ -43,9 +43,16 @@ do
     pip install -c requirements/upper-constraints.txt -r ${proj}/test-requirements.txt
 done
 
-echo '---> Installing openvswitch from openstack repo'
-# the newton release has ovs 2.5.0
-yum install -y http://rdoproject.org/repos/openstack-newton/rdo-release-newton.rpm
+if [ "$branch" == "stable/mitaka" ] || [ "$branch" == "stable/liberty" ]; then
+    # the newton release has ovs 2.5.0
+    echo '---> Installing openvswitch from openstack Newton repo (2.5.0)'
+    yum install -y http://rdoproject.org/repos/openstack-newton/rdo-release-newton.rpm
+else
+    # 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
+fi
+
 yum install -y --nogpgcheck openvswitch
 
 cd $OLDPWD