From: Tim Rozet <trozet@redhat.com>
Date: Mon, 15 Jan 2018 15:07:07 +0000 (+0000)
Subject: Merge "Fixes including default SDN env file in deploy cmd"
X-Git-Tag: opnfv-6.0.0~39
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f867d216c135c30d3c86a28bf52495639ff4e890;hp=847f7673f8ba68583c85eee5c30d7657f82ad50f;p=apex.git

Merge "Fixes including default SDN env file in deploy cmd"
---

diff --git a/build/barometer-install.sh b/build/barometer-install.sh
index 15753a44..ca9b79c1 100755
--- a/build/barometer-install.sh
+++ b/build/barometer-install.sh
@@ -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
 
@@ -87,7 +87,8 @@ function barometer_pkgs {
 
   # 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