From adff3b393f0e345c4611b836cc7c11f968498d76 Mon Sep 17 00:00:00 2001
From: Maryam Tahhan <maryam.tahhan@intel.com>
Date: Sun, 21 Jan 2018 14:31:46 +0000
Subject: docker: barometer-collectd openstack plugin deps
Update the the barometer-collectd container to install the python dependencies
for the openstack plugins.
Change-Id: If8ba14066aff5f0257a400ece642a8d478600c77
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
---
docker/barometer-collectd/Dockerfile | 2 ++
systems/centos/7/build_base_machine.sh | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/docker/barometer-collectd/Dockerfile b/docker/barometer-collectd/Dockerfile
index dd3a8c0b..585e5d05 100644
--- a/docker/barometer-collectd/Dockerfile
+++ b/docker/barometer-collectd/Dockerfile
@@ -17,6 +17,8 @@ RUN echo "collectd_exec ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
WORKDIR ${openstack_plugins}
RUN make
+RUN pip install --upgrade pip
+RUN pip install -r ${openstack_plugins}/collectd-openstack-plugins/requirements.txt
COPY run_collectd.sh /run_collectd.sh
RUN chmod +x /run_collectd.sh
diff --git a/systems/centos/7/build_base_machine.sh b/systems/centos/7/build_base_machine.sh
index 18539315..68735714 100755
--- a/systems/centos/7/build_base_machine.sh
+++ b/systems/centos/7/build_base_machine.sh
@@ -2,7 +2,7 @@
#
# Build a base machine for CentOS distro
#
-# Copyright 2017 OPNFV
+# Copyright 2017-2018 OPNFV
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -57,4 +57,6 @@ net-snmp-devel
# install epel release required for git-review
epel-release
+libvirt-python
+python2-pip
" | grep -v ^#)
--
cgit