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>

diff --git a/docker/barometer-collectd/Dockerfile b/docker/barometer-collectd/Dockerfile
index dd3a8c0..585e5d0 100644 (file)
--- 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 1853931..6873571 100755 (executable)
--- 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 ^#)