diff options
| author |   Emma Foley <emma.l.foley@intel.com> | 2017-10-02 17:04:19 +0000 |
|---|---|---|
| committer | Emma Foley <emma.l.foley@intel.com> | 2017-10-03 08:39:53 +0000 |
| commit | 6d59d776ef30c66e1a6312f5aeb9d1173e21d735 (patch) | |
| tree | c3dffd73ad341ca6b8cc308ae88c97e02c1da8d0 /build/barometer-install.sh | |
| parent | 2ee71b201c0a607f1814bf5fe3e6971f6357db42 (diff) | |
baro: update collectd-openstack branch
COLLECTD_OPENSTACK_GIT_BRANCH has been updated to stable/pike so that aodh
changes will be picked up
Previously, the branch was not actually being checked out, but was being
used as a name for a new branch. This behaviour has been corrected.
Change-Id: I516c4311d2a0cedcca6ec293b62c21234b1e1975
Signed-off-by: Emma Foley <emma.l.foley@intel.com>
Diffstat (limited to 'build/barometer-install.sh')
| -rwxr-xr-x | build/barometer-install.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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 |