From: Zhijiang Hu <hu.zhijiang@zte.com.cn>
Date: Thu, 16 Nov 2017 06:46:42 +0000 (-0500)
Subject: ceilometer needs gnocchi from pike
X-Git-Tag: opnfv-6.0.0~39
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F99%2F47299%2F2;p=daisy.git

ceilometer needs gnocchi from pike

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

diff --git a/ci/kolla-build-vm.sh b/ci/kolla-build-vm.sh
index 552af6fd..63117242 100755
--- a/ci/kolla-build-vm.sh
+++ b/ci/kolla-build-vm.sh
@@ -288,7 +288,7 @@ function config_kolla_with_dpdksource {
     crudini --set $KOLLA_GIT_DIR/kolla/etc/kolla/kolla-build.conf  DEFAULT threads 2
     crudini --set $KOLLA_GIT_DIR/kolla/etc/kolla/kolla-build.conf  DEFAULT retries 10
 
-    crudini --set $KOLLA_GIT_DIR/kolla/etc/kolla/kolla-build.conf  profiles opnfvb "ceilometer, neutron, openvswitch, nova-, cron, kolla-toolbox, fluentd, aodh, mongodb, horizon, heat, cinder, glance, ceph, keystone, rabbitmq, mariadb, memcached, keepalived, haproxy, opendaylight, tgtd, iscsi"
+    crudini --set $KOLLA_GIT_DIR/kolla/etc/kolla/kolla-build.conf  profiles opnfvb "ceilometer, gnocchi, neutron, openvswitch, nova-, cron, kolla-toolbox, fluentd, aodh, mongodb, horizon, heat, cinder, glance, ceph, keystone, rabbitmq, mariadb, memcached, keepalived, haproxy, opendaylight, tgtd, iscsi"
     crudini --set $KOLLA_GIT_DIR/kolla/etc/kolla/kolla-build.conf  DEFAULT profile opnfvb
 
     crudini --set $KOLLA_GIT_DIR/kolla/etc/kolla/kolla-build.conf  ovsdpdk-plugin-ovs type git
diff --git a/code/install_interface_patch.sh b/code/install_interface_patch.sh
index 8502118a..50c8ade6 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="171031195331"
+imageversion="171116161159"
 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 3802fa6b..3bbcb9d1 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="171031195331"
+imageversion="171116161159"
 imageserver="http://artifacts.opnfv.org/daisy/upstream"
 imagename="kolla-image-$imagebranch-$imageversion.tgz"