From: Maryam Tahhan <maryam.tahhan@intel.com>
Date: Thu, 11 Jan 2018 16:34:27 +0000 (+0000)
Subject: docker: add openstack plugins to barometer
X-Git-Tag: opnfv-6.0.0~42^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=10c09bffa6a78490c71660d6eebedf8bd84edd71;p=barometer.git

docker: add openstack plugins to barometer

Add the openstack plugins to the barometer docker. This just clones the source
to make sure it's available in the container. Configuration is up to the end
user.

Change-Id: Iaa62be8363f95b69c76d64bed49f1453597e123b
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
---

diff --git a/docker/Dockerfile b/docker/Dockerfile
index f2005682..dd3a8c0b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,14 +4,19 @@ RUN yum install -y which sudo
 RUN yum install -y git
 ENV DOCKER y
 ENV repos_dir /src
-
+ENV openstack_plugins /src/barometer/src/collectd-openstack-plugins
 RUN git config --global http.sslVerify false
+
 WORKDIR ${repos_dir}
 RUN git clone https://gerrit.opnfv.org/gerrit/barometer
 WORKDIR ${repos_dir}/barometer/systems
 RUN sh ./build_base_machine.sh
+
 RUN useradd -ms /bin/bash collectd_exec
 RUN echo "collectd_exec ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 
+WORKDIR ${openstack_plugins}
+RUN make
+
 COPY run_collectd.sh /run_collectd.sh
 RUN chmod +x /run_collectd.sh