summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Smith <aasmith@redhat.com>2018-08-03 13:20:24 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-08-03 13:20:24 +0000
commit1db7418e39d41cb92e3b1af71d2cb4b9fabb29f2 (patch)
treeb71f65763bca1234fa66877ab9632e434fc782aa
parent4c1b6b2ea5cafcb07207ca07eb589fe34a6e5dd5 (diff)
parentbfc1db4ee0c098354611b69d2929847a9845f48a (diff)
Merge "Enable write_redis plugin for barometer-collectd"
-rwxr-xr-xci/install_dependencies.sh3
-rw-r--r--src/collectd/Makefile1
-rwxr-xr-xsystems/centos/7/build_base_machine.sh1
-rwxr-xr-xsystems/fedora/22/build_base_machine.sh1
-rwxr-xr-xsystems/rhel/7/build_base_machine.sh1
5 files changed, 7 insertions, 0 deletions
diff --git a/ci/install_dependencies.sh b/ci/install_dependencies.sh
index 3fe1e725..87f8163f 100755
--- a/ci/install_dependencies.sh
+++ b/ci/install_dependencies.sh
@@ -29,6 +29,9 @@ sudo yum -y install rpm-build \
libcap-devel xfsprogs-devel iptables-devel \
libmemcached-devel gtk2-devel libvirt-devel
+# For DMA component
+sudo yum -y install hiredis-devel
+
# For intel-cmt-cat
sudo yum -y install wget
diff --git a/src/collectd/Makefile b/src/collectd/Makefile
index 7d306528..670c14fa 100644
--- a/src/collectd/Makefile
+++ b/src/collectd/Makefile
@@ -47,6 +47,7 @@ CONFIG_CMD += --with-libjevents=/usr/local
CONFIG_CMD += --enable-exec
CONFIG_CMD += --enable-python
CONFIG_CMD += --enable-threshold
+CONFIG_CMD += --enable-write_redis
CONFIG_CMD += --disable-perl
CONFIG_CMD += --with-librdkafka=/usr
CONFIG_CMD += --disable-lvm
diff --git a/systems/centos/7/build_base_machine.sh b/systems/centos/7/build_base_machine.sh
index 68735714..7e1cf2da 100755
--- a/systems/centos/7/build_base_machine.sh
+++ b/systems/centos/7/build_base_machine.sh
@@ -54,6 +54,7 @@ libvirt-daemon
mcelog
wget
net-snmp-devel
+hiredis-devel
# install epel release required for git-review
epel-release
diff --git a/systems/fedora/22/build_base_machine.sh b/systems/fedora/22/build_base_machine.sh
index 5662eb41..c0c61462 100755
--- a/systems/fedora/22/build_base_machine.sh
+++ b/systems/fedora/22/build_base_machine.sh
@@ -49,6 +49,7 @@ git
pciutils
cifs-utils
socat
+hiredis-devel
# install git-review tool
git-review
diff --git a/systems/rhel/7/build_base_machine.sh b/systems/rhel/7/build_base_machine.sh
index 85382ae3..037f87ad 100755
--- a/systems/rhel/7/build_base_machine.sh
+++ b/systems/rhel/7/build_base_machine.sh
@@ -54,6 +54,7 @@ libvirt-daemon
mcelog
wget
net-snmp-devel
+hiredis-devel
# install epel release required for git-review
epel-release