barometer: move to opnfv puppet repo

[apex.git] / build / barometer-install.sh

diff --git a/build/barometer-install.sh b/build/barometer-install.sh
index 0e7dd96..ca9b79c 100755 (executable)
--- a/build/barometer-install.sh
+++ b/build/barometer-install.sh
@@ -20,7 +20,7 @@
 source ./variables.sh
 
 # 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
@@ -29,7 +29,7 @@ GETFLAG="--no-check-certificate"
 # Locations of repos
 ARTIFACTS_BAROM="artifacts.opnfv.org/barometer"
 COLLECTD_OPENSTACK_REPO="https://github.com/openstack/collectd-ceilometer-plugin"
-PUPPET_BAROMETER_REPO="https://github.com/johnhinman/puppet-barometer"
+PUPPET_BAROMETER_REPO="https://github.com/opnfv/barometer.git"
 
 # upload barometer packages tar, extract, and install
 
@@ -81,13 +81,14 @@ 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
 
   # get the barometer puppet module and tar it
   rm -rf puppet-barometer
-  git clone $PUPPET_BAROMETER_REPO
+  git clone $PUPPET_BAROMETER_REPO puppet-barometer
+  cd puppet-barometer
   pushd puppet-barometer/ > /dev/null
   git archive --format=tar.gz HEAD > ${BUILD_DIR}/puppet-barometer.tar.gz
   popd > /dev/null