From: Tim Rozet <trozet@redhat.com>
Date: Wed, 4 Oct 2017 15:36:34 +0000 (+0000)
Subject: Merge "baro: update collectd-openstack branch"
X-Git-Tag: opnfv-6.0.0~78
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=992e5d6084ddea8d3bb65a92bd98b8789be3c703;hp=fa4fcdc5dd0c866e837e142f6eb164435fb0c1d4;p=apex.git

Merge "baro: update collectd-openstack branch"
---

diff --git a/build/barometer-install.sh b/build/barometer-install.sh
index 9e5dfc73..bde7479e 100755
--- a/build/barometer-install.sh
+++ b/build/barometer-install.sh
@@ -19,7 +19,7 @@
 # puppet-barometer module.
 
 # Versions/branches
-COLLECTD_OPENSTACK_PLUGINS_BRANCH="stable/ocata"
+COLLECTD_OPENSTACK_PLUGINS_BRANCH="stable/pike"
 
 ARCH="6.el7.centos.x86_64.rpm"
 # don't fail because of missing certificate
@@ -80,7 +80,7 @@ function barometer_pkgs {
   rm -rf collectd-openstack-plugins
   git clone $COLLECTD_OPENSTACK_REPO collectd-openstack-plugins
   pushd collectd-openstack-plugins
-  git checkout -b $COLLECTD_OPENSTACK_PLUGINS_BRANCH
+  git checkout $COLLECTD_OPENSTACK_PLUGINS_BRANCH
   git archive --format=tar.gz HEAD > ${BUILD_DIR}/collectd-openstack-plugins.tar.gz
   popd > /dev/null