Switch master branch to openstack pike

According to the patch in upstream [1].

[1] https://review.openstack.org/#/c/514548/

Change-Id: Ie8edee057aa46ffe0c3f4d96f0c9afb4f1635920
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>

diff --git a/code/install_interface_patch.sh b/code/install_interface_patch.sh
index 5177425..8502118 100755 (executable)
--- a/code/install_interface_patch.sh
+++ b/code/install_interface_patch.sh
@@ -8,8 +8,8 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-imagebranch="ocata"
-imageversion="170811155446"
+imagebranch="pike"
+imageversion="171031195331"
 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 16988a6..3802fa6 100755 (executable)
--- a/code/makefile_patch.sh
+++ b/code/makefile_patch.sh
@@ -12,8 +12,8 @@
 TOOLS_PATH=$1
 CACHE_PATH=/home/cache
 
-imagebranch="ocata"
-imageversion="170811155446"
+imagebranch="pike"
+imageversion="171031195331"
 imageserver="http://artifacts.opnfv.org/daisy/upstream"
 imagename="kolla-image-$imagebranch-$imageversion.tgz"