diff options
author | Emma Foley <efoley@redhat.com> | 2020-11-11 19:05:11 +0000 |
---|---|---|
committer | Emma Foley <efoley@redhat.com> | 2020-11-19 13:41:50 +0000 |
commit | 2847e052aef84d97b674aee3a655c55091844925 (patch) | |
tree | 8de8d58d518586b3da45a9ee3ae5f535471e7686 /systems/centos | |
parent | 26a9cd755e8149c16a16ab9af5b54ca1893484fc (diff) |
[container][collectd] Update barometer-collectd container for CentOS 8
Update collectd to 5.12
Add in CentOS as base for the barometer-collectd container
Remove openstack plugins - they are not used anymore
Use packaged DPDK (v18.11 in CentOS 7 amd v19.11 in CentOS 8)
Install packages from package manager instead of building libpqos,
pmu-tools and librdkafka
Combine install commands into one for CentOS8
(systems/centos/8/build_base_machine.sh)
These changes reduce the size of the container from 1.7GB to ~825MB.
Change-Id: I7e474f9578cdbcc7cce8c4fbc5e297eab89fd371
Signed-off-by: Emma Foley <efoley@redhat.com>
Diffstat (limited to 'systems/centos')
-rwxr-xr-x | systems/centos/7/build_base_machine.sh | 16 | ||||
-rwxr-xr-x | systems/centos/8/build_base_machine.sh | 87 |
2 files changed, 98 insertions, 5 deletions
diff --git a/systems/centos/7/build_base_machine.sh b/systems/centos/7/build_base_machine.sh index 62473fa3..41595d7e 100755 --- a/systems/centos/7/build_base_machine.sh +++ b/systems/centos/7/build_base_machine.sh @@ -32,8 +32,8 @@ yum-builddep -y collectd # Install required packages yum -y install $(echo " -kernel-devel -kernel-headers +#kernel-devel +#kernel-headers make gcc gcc-c++ @@ -58,10 +58,16 @@ net-snmp-devel hiredis-devel libmicrohttpd-devel jansson-devel +libatasmart-devel +librdkafka-devel +yajl-devel +protobuf-c-devel +rrdtool-devel +intel-cat-cmt +dpdk-18.11 +qpid-proton-c-devel -# install epel release required for git-review -epel-release libvirt-python -python2-pip +python3-pip numactl-devel " | grep -v ^#) diff --git a/systems/centos/8/build_base_machine.sh b/systems/centos/8/build_base_machine.sh new file mode 100755 index 00000000..45112f7a --- /dev/null +++ b/systems/centos/8/build_base_machine.sh @@ -0,0 +1,87 @@ +#!/bin/bash +# +# Build a base machine for CentOS distro +# +# Copyright 2017-2019 Intel Corporation and OPNFV. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# +# Contributors: +# Aihua Li, Huawei Technologies. +# Martin Klozik, Intel Corporation. +# Maryam Tahhan, Intel Corporation. +# Synchronize package index files +dnf -y update + +# For collectd +dnf install -y yum-utils +dnf install -y epel-release +dnf install -y centos-release-opstools +dnf builddep -y collectd + +# For CentOS 8, a lot of the dependencies are from PowerTools repo +dnf install -y 'dnf-command(config-manager)' && dnf config-manager --set-enabled PowerTools + +# CentOS 8 doesn't have intel-cmt-cat-devel packaged, so use the version from CentOS7 +dnf install -y http://mirror.centos.org/centos/7/os/x86_64/Packages/intel-cmt-cat-3.0.1-1.el7.x86_64.rpm \ + http://mirror.centos.org/centos/7/os/x86_64/Packages/intel-cmt-cat-devel-3.0.1-1.el7.x86_64.rpm + +# Install required packages +dnf -y install $(echo " + +make +gcc +gcc-c++ +autoconf +automake +flex +bison +libtool +pkg-config +git-core +rpm-build +libcap-devel +xfsprogs-devel +iptables-devel +libmemcached-devel +gtk2-devel +libvirt-devel +libvirt-daemon +mcelog +wget +net-snmp-devel +hiredis-devel +libmicrohttpd-devel +jansson-devel +libpcap-devel +lua-devel +OpenIPMI-devel +libmnl-devel +librabbitmq-devel +iproute-static +libatasmart-devel +librdkafka-devel +yajl-devel +protobuf-c-devel +rrdtool-devel +dpdk-19.11 +qpid-proton-c-devel + +#install epel release required for git-review +epel-release +python3-libvirt +python3-pip +python36-devel +numactl-devel +" | grep -v ^#) |