summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-08-08 16:20:48 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-08 16:20:48 +0000
commit432f1f9339938342bbdb6c4b98752b5f8848add4 (patch)
tree9122da70df6de0427d699b86933600ea612f424b
parent19f6d1fc158235166773ef2e3ba8728dc2cf4d71 (diff)
parentaff91efb27e4dbcf4ea71761cdf3c464a010a84d (diff)
Merge "build: added intel_cmt_cat rpm"
-rwxr-xr-xbuild/barometer-install.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/build/barometer-install.sh b/build/barometer-install.sh
index 0388b681..7b7d2475 100755
--- a/build/barometer-install.sh
+++ b/build/barometer-install.sh
@@ -20,7 +20,7 @@
# Versions/branches
COLLECTD_CEILOMETER_PLUGIN_BRANCH="stable/ocata"
-INTEL_CMT_CAT_VER="1.0.1-1.el7.centos.x86_64.rpm"
+INTEL_CMT_CAT_VER="1.1.0-1.el7.centos.x86_64.rpm"
ARCH="6.el7.centos.x86_64.rpm"
# don't fail because of missing certificate
@@ -59,6 +59,8 @@ function barometer_pkgs {
wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-ovs_events-$SUFFIX
wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-ovs_stats-$SUFFIX
wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-virt-$SUFFIX
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/intel-cmt-cat-$INTEL_CMT_CAT_VER
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/intel-cmt-cat-devel-$INTEL_CMT_CAT_VER
wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-python-$SUFFIX
curl "https://bootstrap.pypa.io/get-pip.py" -o "get-pip.py"
@@ -108,6 +110,9 @@ function barometer_pkgs {
/opt/collectd-python-${SUFFIX} \
/opt/collectd-ovs_events-${SUFFIX} \
/opt/collectd-ovs_stats-${SUFFIX} \
+ /opt/collectd-virt-${SUFFIX} \
+ /opt/intel-cmt-cat-${INTEL_CMT_CAT_VER} \
+ /opt/intel-cmt-cat-devel-${INTEL_CMT_CAT_VER} \
/opt/collectd-virt-${SUFFIX}" \
-a $OVERCLOUD_IMAGE