From 0e14c4cb61521bdfc3cd597342f526e1c30ff405 Mon Sep 17 00:00:00 2001
From: Billy O'Mahony <billy.o.mahony@intel.com>
Date: Wed, 13 Jan 2016 18:00:00 +0000
Subject: fuel_plugin: Working version on Montreal POD

- change libvirt on controller to 1.2.12
- change qemu on controller to 2.2.1
- work around _set_device_mtu issue
- remove existing OVS neutron plugin
- fixes to puppet resource ordering
- numerous other smaller changes

Change-Id: I9a7c66065013a43f5e88871ef8b9f1cdd1038245
Signed-off-by: Mark D. Gray <mark.d.gray@intel.com>
Signed-off-by: Billy O'Mahony <billy.o.mahony@intel.com>
Signed-off-by: Michal Ptacek <michalx.ptacek@intel.com>
(cherry picked from commit 8d68d8de881bd57b4e164219e8dcd09dfd2c05a2)
---
 fuel-plugin-ovsnfv/pre_build_hook | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'fuel-plugin-ovsnfv/pre_build_hook')

diff --git a/fuel-plugin-ovsnfv/pre_build_hook b/fuel-plugin-ovsnfv/pre_build_hook
index c8d1ce3..600e2b7 100755
--- a/fuel-plugin-ovsnfv/pre_build_hook
+++ b/fuel-plugin-ovsnfv/pre_build_hook
@@ -13,31 +13,30 @@ networking_ovs_dpdk=${networking_ovs_dpdk:-master}
 
 rm -rf ${TMP}
 mkdir -p ${TMP}
-rm -rf ${DIR}/repositories/${BUILD_FOR}/*
 
 # sudo apt-get install -qq --reinstall --print-uris bash | perl -lne "/'(.*?)'/;print \$1"
 if [ "$INCLUDE_DEPENDENCIES" = true ]
 then
+  rm -rf ${DIR}/repositories/${BUILD_FOR}/*
   wget --content-disposition -N -P ${DIR}/repositories/${BUILD_FOR}/ -i "${DIR}/ovs_package/${BUILD_FOR}/dependencies.txt"
 fi
 
 cd ${TMP}
 
-rm -rf ${TMP}/networking-ovs-dpdk
-git clone https://github.com/openstack/networking-ovs-dpdk ${TMP}/networking-ovs-dpdk
-#rm -rf ${TMP}/networking-ovs-dpdk/.git #Install requires this to be a git repo
+git clone https://github.com/openstack/networking-ovs-dpdk --branch stable/kilo --single-branch networking-ovs-dpdk
+rm -rf ${TMP}/networking_ovs_dpdk/.git
 tar cfz ${DIR}/repositories/${BUILD_FOR}/networking-ovs-dpdk.tgz networking-ovs-dpdk
 
-rm -rf ${TMP}/ovs
-git clone https://github.com/openvswitch/ovs  --branch master --single-branch ovs
+git clone https://github.com/openvswitch/ovs
+cd ovs
+git checkout 1e77bbe565bbf5ae7f4c47f481a4097d666d3d68
+cd ..
 rm -rf ${TMP}/ovs/.git
 tar cfz ${DIR}/repositories/${BUILD_FOR}/ovs.tgz ovs
 
-rm -rf ${TMP}/dpdk
-git clone http://dpdk.org/git/dpdk --branch v2.1.0 --single-branch dpdk
+git clone http://dpdk.org/git/dpdk --branch v2.0.0 --single-branch dpdk
 rm -rf ${TMP}/dpdk/.git
 tar cfz ${DIR}/repositories/${BUILD_FOR}/dpdk.tgz dpdk
 
-cd -
+cd $DIR
 rm -rf ${TMP}
-
-- 
cgit 1.2.3-korg