summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitreview3
-rwxr-xr-xsrc/fuel-plugin/build-collectd.sh32
-rw-r--r--src/fuel-plugin/enable_dpdk_stats_plugin.patch40
-rw-r--r--src/fuel-plugin/vagrant/Vagrantfile4
4 files changed, 19 insertions, 60 deletions
diff --git a/.gitreview b/.gitreview
index 17cb67ee..ff5a22ac 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,5 +1,4 @@
[gerrit]
host=gerrit.opnfv.org
port=29418
-project=fastpathmetrics.git
-
+project=barometer.git
diff --git a/src/fuel-plugin/build-collectd.sh b/src/fuel-plugin/build-collectd.sh
index 500533f3..3eefa635 100755
--- a/src/fuel-plugin/build-collectd.sh
+++ b/src/fuel-plugin/build-collectd.sh
@@ -5,19 +5,18 @@ BUILD_HOME="$(pwd)"
set -eux
sudo apt-get -y install build-essential dh-autoreconf fakeroot devscripts dpkg-dev git wget
-sudo apt-get -y install debhelper po-debconf dh-systemd \
- bison flex autotools-dev libltdl-dev pkg-config \
- dh-strip-nondeterminism \
+sudo apt-get -y install \
+ debhelper dpkg-dev po-debconf dh-systemd dh-strip-nondeterminism \
+ bison flex autotools-dev libltdl-dev pkg-config \
iptables-dev \
javahelper \
libatasmart-dev \
libcap-dev \
libcurl4-gnutls-dev \
- libcurl3-gnutls-dev \
libdbi0-dev \
libesmtp-dev \
libganglia1-dev \
- libgcrypt20-dev \
+ libgcrypt11-dev \
libglib2.0-dev \
libgps-dev \
libhiredis-dev \
@@ -27,24 +26,26 @@ sudo apt-get -y install debhelper po-debconf dh-systemd \
liblvm2-dev \
libmemcached-dev \
libmodbus-dev \
- libmosquitto-dev \
libmnl-dev \
+ libmosquitto-dev \
libmysqlclient-dev \
libnotify-dev \
libopenipmi-dev \
liboping-dev \
libow-dev \
- libpcap-dev \
+ libpcap0.8-dev \
+ libpcap-dev\
libperl-dev \
libpq-dev \
libprotobuf-c-dev \
- librabbitmq-dev \
- librdkafka-dev \
libriemann-client-dev \
+ librdkafka-dev \
+ librabbitmq-dev \
librrd-dev \
libsensors4-dev \
libsigrok-dev \
libsnmp-dev \
+ libsnmp9-dev \
perl \
libtokyocabinet-dev \
libtokyotyrant-dev \
@@ -55,20 +56,19 @@ sudo apt-get -y install debhelper po-debconf dh-systemd \
libxen-dev \
libxml2-dev \
libyajl-dev \
+ linux-libc-dev \
default-jdk \
protobuf-c-compiler \
- python-dev \
- riemann-c-client \
- patch
+ python-dev
cd ${BUILD_HOME}
rm -rf collectd
-git clone https://github.com/collectd/collectd; cd collectd; git checkout ed946a1;
-git clone https://github.com/collectd/pkg-debian; cd pkg-debian; git checkout 3041e46
-patch -p1 < ../../../enable_dpdk_stats_plugin.patch mv debian ..
-cd ${BUILD_HOME}/collectd
+git clone https://github.com/collectd/collectd; cd collectd; git checkout 8acc85b
+git clone https://github.com/collectd/pkg-debian; cd pkg-debian; git checkout e5972da
+mv debian ..
+cd ${BUILD_HOME}/collectd
./build.sh
debian/rules build || true
debian/rules build
diff --git a/src/fuel-plugin/enable_dpdk_stats_plugin.patch b/src/fuel-plugin/enable_dpdk_stats_plugin.patch
deleted file mode 100644
index ded647ff..00000000
--- a/src/fuel-plugin/enable_dpdk_stats_plugin.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/debian/rules b/debian/rules
-index e26fb54..799c9ef 100755
---- a/debian/rules
-+++ b/debian/rules
-@@ -50,6 +50,7 @@ confflags = --host=$(DEB_HOST_GNU_TYPE) \
- --mandir=\$${prefix}/share/man \
- --localstatedir=/var --sysconfdir=/etc \
- --with-perl-bindings="INSTALLDIRS=vendor INSTALL_BASE=" \
-+ --with-libdpdk=/usr \
- --without-libstatgrab \
- --without-included-ltdl \
- --disable-static \
-@@ -258,7 +259,7 @@ binary-indep: install-indep
- dh_testdir
- dh_testroot
- dh_installchangelogs -i ChangeLog
-- dh_installdocs -A -i debian/README.Debian AUTHORS README TODO
-+ dh_installdocs -A -i debian/README.Debian AUTHORS README
- dh_installexamples -i contrib/examples/myplugin.c \
- contrib/examples/MyPlugin.pm
- dh_compress -i -Xexamples/
-@@ -272,7 +273,7 @@ binary-arch: build install-arch
- dh_testdir
- dh_testroot
- dh_installchangelogs -a ChangeLog
-- dh_installdocs -A -a debian/README.Debian AUTHORS README TODO
-+ dh_installdocs -A -a debian/README.Debian AUTHORS README
- dh_installdocs -a debian/NEWS.Debian debian/README.Debian.plugins
- dh_installexamples -a contrib/collectd2html.pl contrib/collection.cgi \
- contrib/collection3/ contrib/php-collection/ \
-@@ -305,7 +306,7 @@ binary-arch: build install-arch
- dh_shlibdeps -a -Ncollectd-core -Ncollectd
- dpkg-shlibdeps -Tdebian/collectd.substvars \
- -dDepends debian/collectd-core/usr/lib/collectd/rrdtool.so
-- dpkg-shlibdeps -Tdebian/collectd-core.substvars \
-+ dpkg-shlibdeps --ignore-missing-info -Tdebian/collectd-core.substvars \
- -dDepends debian/collectd-core/usr/sbin/* \
- -dSuggests debian/collectd-core/usr/lib/collectd/*.so
- grep shlibs:Suggests debian/collectd-core.substvars \
-
diff --git a/src/fuel-plugin/vagrant/Vagrantfile b/src/fuel-plugin/vagrant/Vagrantfile
index 06bbc958..8e2d9db1 100644
--- a/src/fuel-plugin/vagrant/Vagrantfile
+++ b/src/fuel-plugin/vagrant/Vagrantfile
@@ -6,8 +6,7 @@ VAGRANTFILE_API_VERSION = "2"
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
- config.vm.box = "trusty-server-cloudimg-amd64"
- config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box"
+ config.vm.box = "bento/ubuntu-16.04"
config.vm.define "fuel" do | h |
h.vm.host_name = "fuel"
@@ -16,6 +15,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
h.vm.provider :virtualbox do |v|
v.customize ["modifyvm", :id, "--memory", 4096]
v.customize ["modifyvm", :id, "--cpus", 4]
+ v.customize "post-boot",["controlvm", :id, "setlinkstate1", "on"]
end
end
end