diff options
| author |   Maryam Tahhan <maryam.tahhan@intel.com> | 2018-01-23 11:36:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-01-23 11:36:41 +0000 |
| commit | 04c4011bf6dab58da8365eca9388e6cacbdf8734 (patch) | |
| tree | 342fccbcbc6c950b54aa5311c078c536e9e7f994 | |
| parent | fddabfadabcdfc8a0fa428b5a7688a74877ee60b (diff) | |
| parent | adff3b393f0e345c4611b836cc7c11f968498d76 (diff) | |
Merge "docker: barometer-collectd openstack plugin deps"
| -rw-r--r-- | docker/barometer-collectd/Dockerfile | 2 | ||||
| -rwxr-xr-x | systems/centos/7/build_base_machine.sh | 4 |
2 files changed, 5 insertions, 1 deletions
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 ^#) |