1 files changed, 15 insertions, 11 deletions
diff --git a/systems/centos/8/build_base_machine.sh b/systems/centos/8/build_base_machine.sh
index 45112f7a..bb3caa12 100755
--- a/systems/centos/8/build_base_machine.sh
+++ b/systems/centos/8/build_base_machine.sh
@@ -2,7 +2,8 @@
 #
 # Build a base machine for CentOS distro
 #
-# Copyright 2017-2019 Intel Corporation and OPNFV. All rights reserved.
+# Copyright 2017-2021 Intel Corporation, Anuket and others.
+# 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.
@@ -21,21 +22,20 @@
 #   Aihua Li, Huawei Technologies.
 #   Martin Klozik, Intel Corporation.
 #   Maryam Tahhan, Intel Corporation.
+#   Emma Foley, Red Hat.
 # 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
+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
+# Use collectd.spec from centos-opstools to install deps since
+# ``dnf builddep -y collectd`` isn't finding collectd in centos-opstools
+dnf builddep -y https://raw.githubusercontent.com/centos-opstools/collectd/master/collectd.spec
 
 # Install required packages
 dnf -y install $(echo "
@@ -50,7 +50,9 @@ bison
 libtool
 pkg-config
 git-core
+sudo
 rpm-build
+which
 libcap-devel
 xfsprogs-devel
 iptables-devel
@@ -75,13 +77,15 @@ librdkafka-devel
 yajl-devel
 protobuf-c-devel
 rrdtool-devel
-dpdk-19.11
+dpdk-20.11
 qpid-proton-c-devel
 
-#install epel release required for git-review
-epel-release
-python3-libvirt
+# ping collectd-6
+liboping-devel
+
 python3-pip
 python36-devel
 numactl-devel
+intel-cmt-cat
+intel-cmt-cat-devel
 " | grep -v ^#)