summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-02-23 00:58:54 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-02-23 00:58:54 +0000
commit26e6de0b9d2b60f72380949dcf319e00e03daa95 (patch)
tree5cbf5a6506b3b37f227f3ba7823c6e601b6a14b6
parentfcec435be9f24fd9b0d9eba8b7443bb7dc241949 (diff)
parentca6ac980cc085ac0c5acc5442ddc8a206f06c2ce (diff)
Merge "barometer: fix barometer apex build"
-rwxr-xr-xbuild/barometer-install.sh73
-rw-r--r--build/opnfv-environment.yaml2
-rwxr-xr-xbuild/overcloud-full.sh3
3 files changed, 57 insertions, 21 deletions
diff --git a/build/barometer-install.sh b/build/barometer-install.sh
index ca9b79c1..2391b6b8 100755
--- a/build/barometer-install.sh
+++ b/build/barometer-install.sh
@@ -22,7 +22,8 @@ source ./variables.sh
# Versions/branches
COLLECTD_OPENSTACK_PLUGINS_BRANCH="stable/pike"
-ARCH="6.el7.centos.x86_64.rpm"
+ARCH="8.el7.centos.x86_64.rpm"
+
# don't fail because of missing certificate
GETFLAG="--no-check-certificate"
@@ -58,19 +59,36 @@ function barometer_pkgs {
| cut -d'-' -f9)
RDT_SUFFIX=$INTEL_RDT_VER-1.el7.centos.x86_64.rpm
- wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/libcollectdclient-$SUFFIX
- wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/libcollectdclient-devel-$SUFFIX
- wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-$SUFFIX
- wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-utils-$SUFFIX
- 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-$RDT_SUFFIX
- wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/intel-cmt-cat-devel-$RDT_SUFFIX
- wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-python-$SUFFIX
- wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-snmp-$SUFFIX
- wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-snmp_agent-$SUFFIX
- wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-intel_rdt-$SUFFIX
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/libcollectdclient-${SUFFIX}
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/libcollectdclient-devel-${SUFFIX}
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-${SUFFIX}
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-utils-${SUFFIX}
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-python-${SUFFIX}
+ 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/intel-cmt-cat-${RDT_SUFFIX}
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/intel-cmt-cat-devel-${RDT_SUFFIX}
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-intel_rdt-${SUFFIX}
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-snmp-${SUFFIX}
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-snmp_agent-${SUFFIX}
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-virt-${SUFFIX}
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-sensors-${SUFFIX}
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-ceph-${SUFFIX}
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-curl_json-${SUFFIX}
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-apache-${SUFFIX}
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-write_http-${SUFFIX}
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-mysql-${SUFFIX}
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-ping-${SUFFIX}
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-smart-${SUFFIX}
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-curl_xml-${SUFFIX}
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-disk-${SUFFIX}
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-rrdcached-${SUFFIX}
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-iptables-${SUFFIX}
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-curl-${SUFFIX}
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-ipmi-${SUFFIX}
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-netlink-${SUFFIX}
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-rrdtool-${SUFFIX}
+ wget $GETFLAG $ARTIFACTS_BAROM/$BAROMETER_VER/collectd-lvm-${SUFFIX}
curl "https://bootstrap.pypa.io/get-pip.py" -o "get-pip.py"
tar cfz collectd.tar.gz *.rpm get-pip.py
@@ -88,8 +106,7 @@ function barometer_pkgs {
# get the barometer puppet module and tar it
rm -rf puppet-barometer
git clone $PUPPET_BAROMETER_REPO puppet-barometer
- cd puppet-barometer
- pushd puppet-barometer/ > /dev/null
+ pushd puppet-barometer/puppet-barometer/ > /dev/null
git archive --format=tar.gz HEAD > ${BUILD_DIR}/puppet-barometer.tar.gz
popd > /dev/null
@@ -119,6 +136,10 @@ function barometer_pkgs {
-a $OVERCLOUD_IMAGE
LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \
+ --run-command 'yum remove -y collectd-write_sensu-5.8.0-2.el7.x86_64' \
+ -a $OVERCLOUD_IMAGE
+
+ LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \
--run-command "yum install -y \
/opt/libcollectdclient-${SUFFIX} \
/opt/libcollectdclient-devel-${SUFFIX} \
@@ -132,7 +153,24 @@ function barometer_pkgs {
/opt/collectd-intel_rdt-${SUFFIX} \
/opt/collectd-snmp-${SUFFIX} \
/opt/collectd-snmp_agent-${SUFFIX} \
- /opt/collectd-virt-${SUFFIX}" \
+ /opt/collectd-virt-${SUFFIX} \
+ /opt/collectd-sensors-${SUFFIX} \
+ /opt/collectd-ceph-${SUFFIX} \
+ /opt/collectd-curl_json-${SUFFIX} \
+ /opt/collectd-apache-${SUFFIX} \
+ /opt/collectd-write_http-${SUFFIX} \
+ /opt/collectd-mysql-${SUFFIX} \
+ /opt/collectd-ping-${SUFFIX} \
+ /opt/collectd-smart-${SUFFIX} \
+ /opt/collectd-curl_xml-${SUFFIX} \
+ /opt/collectd-disk-${SUFFIX} \
+ /opt/collectd-rrdcached-${SUFFIX} \
+ /opt/collectd-iptables-${SUFFIX} \
+ /opt/collectd-curl-${SUFFIX} \
+ /opt/collectd-ipmi-${SUFFIX} \
+ /opt/collectd-netlink-${SUFFIX} \
+ /opt/collectd-rrdtool-${SUFFIX} \
+ /opt/collectd-lvm-${SUFFIX}" \
-a $OVERCLOUD_IMAGE
# install collectd-openstack-plugins
@@ -150,4 +188,3 @@ function barometer_pkgs {
--run-command 'mkdir -p /etc/collectd/collectd.conf.d' \
-a $OVERCLOUD_IMAGE
}
-
diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml
index 589c00c5..3df18e97 100644
--- a/build/opnfv-environment.yaml
+++ b/build/opnfv-environment.yaml
@@ -160,7 +160,7 @@ parameter_defaults:
ComputeServices:
- OS::TripleO::Services::AuditD
- OS::TripleO::Services::Sshd
- #- OS::TripleO::Services::Barometer
+ - OS::TripleO::Services::Barometer
- OS::TripleO::Services::CACerts
- OS::TripleO::Services::CephClient
- OS::TripleO::Services::CephOSD
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 527e39ea..7ed57d00 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -148,8 +148,7 @@ LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \
-a overcloud-full_build.qcow2
# upload and install barometer packages
- # FIXME collectd pkgs conflict during upgrade to Pike
- # barometer_pkgs overcloud-full_build.qcow2
+ barometer_pkgs overcloud-full_build.qcow2
fi # end x86_64 specific items