From: Zhijiang Hu <hu.zhijiang@zte.com.cn>
Date: Wed, 22 Nov 2017 09:43:32 +0000 (-0500)
Subject: Switch ODL version to Carbon-SR1
X-Git-Tag: opnfv-6.0.0~35
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F39%2F47639%2F1;p=daisy.git

Switch ODL version to Carbon-SR1

SR2 seems has issues with FIP ping test

Change-Id: I4aea097f2009c2c33de8fc85820bf68c1cbb316a
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
---

diff --git a/code/install_interface_patch.sh b/code/install_interface_patch.sh
index e082c038..384aa7dd 100755
--- a/code/install_interface_patch.sh
+++ b/code/install_interface_patch.sh
@@ -9,7 +9,7 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 imagebranch="pike"
-imageversion="171117113539"
+imageversion="171121172754"
 imageserver="http://artifacts.opnfv.org/daisy/upstream"
 imagedir="/var/lib/daisy/versionfile/kolla"
 imagename="kolla-image-$imagebranch-$imageversion.tgz"
diff --git a/code/makefile_patch.sh b/code/makefile_patch.sh
index bdfdf17f..4221fce6 100755
--- a/code/makefile_patch.sh
+++ b/code/makefile_patch.sh
@@ -13,7 +13,7 @@ TOOLS_PATH=$1
 CACHE_PATH=/home/cache
 
 imagebranch="pike"
-imageversion="171117113539"
+imageversion="171121172754"
 imageserver="http://artifacts.opnfv.org/daisy/upstream"
 imagename="kolla-image-$imagebranch-$imageversion.tgz"