diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/fuel-plugin/build-collectd.sh | 65 | ||||
| -rwxr-xr-x | src/fuel-plugin/deployment_scripts/install.sh | 2 | ||||
| -rw-r--r-- | src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_install.pp | 5 | ||||
| -rwxr-xr-x | src/fuel-plugin/pre_build_hook | 12 |
4 files changed, 79 insertions, 5 deletions
diff --git a/src/fuel-plugin/build-collectd.sh b/src/fuel-plugin/build-collectd.sh new file mode 100755 index 00000000..30166a01 --- /dev/null +++ b/src/fuel-plugin/build-collectd.sh @@ -0,0 +1,65 @@ +#!/bin/bash + +BUILD_HOME="$(pwd)" + +set -eux +sudo apt-get -y install build-essential dh-autoreconf fakeroot dpkg-dev devscripts dpkg-dev git wget + +sudo apt-get -y install debhelper dpkg-dev po-debconf dh-systemd \ + bison flex autotools-dev libltdl-dev pkg-config \ + iptables-dev \ + javahelper \ + libatasmart-dev \ + libcap-dev \ + libcurl4-gnutls-dev \ + libdbi0-dev \ + libesmtp-dev \ + libganglia1-dev \ + libgcrypt11-dev \ + libglib2.0-dev \ + libhiredis-dev \ + libldap2-dev \ + liblvm2-dev \ + libmemcached-dev \ + libmodbus-dev \ + libmnl-dev \ + libnotify-dev \ + libopenipmi-dev \ + liboping-dev \ + libow-dev \ + libpcap0.8-dev \ + libpcap-dev \ + libperl-dev \ + libpq-dev \ + librdkafka-dev \ + librabbitmq-dev \ + librrd-dev \ + libsensors4-dev \ + libsigrok-dev \ + libsnmp9-dev \ + libsnmp-dev \ + perl \ + libtokyocabinet-dev \ + libtokyotyrant-dev \ + libudev-dev \ + libupsclient-dev \ + libvarnishapi-dev \ + libvirt-dev \ + libxml2-dev \ + libyajl-dev \ + linux-libc-dev \ + default-jdk \ + protobuf-c-compiler \ + python-dev + + +cd ${BUILD_HOME} +rm -rf collectd +git clone https://github.com/collectd/collectd; cd collectd; git checkout 37fe166; +git clone https://github.com/collectd/pkg-debian; cd pkg-debian; git checkout e2e3b00; mv debian .. +cd ${BUILD_HOME}/collectd + +./build.sh +debian/rules build || true +debian/rules build +fakeroot debian/rules binary diff --git a/src/fuel-plugin/deployment_scripts/install.sh b/src/fuel-plugin/deployment_scripts/install.sh index 9a9bf613..8f4edef0 100755 --- a/src/fuel-plugin/deployment_scripts/install.sh +++ b/src/fuel-plugin/deployment_scripts/install.sh @@ -47,7 +47,7 @@ cat << EOF > /etc/collectd/collectd.conf.d/collectd-ceilometer-plugin.conf # # Ceilometer user creds OS_USERNAME "$OS_USERNAME" OS_PASSWORD "$OS_PASSWORD" - OS_TENANT_NAME "service" + OS_TENANT_NAME "services" </Module> </Plugin> diff --git a/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_install.pp b/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_install.pp index 63a2e949..ffe3d6d9 100644 --- a/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_install.pp +++ b/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_install.pp @@ -1,6 +1,5 @@ if $operatingsystem == 'Ubuntu' { - exec { "install collectd": - command => "apt-get install -y collectd", - path => "/usr/bin:/usr/sbin:/bin:/sbin"; + package { 'collectd': + ensure => installed, } } diff --git a/src/fuel-plugin/pre_build_hook b/src/fuel-plugin/pre_build_hook index eda8601b..ffb49347 100755 --- a/src/fuel-plugin/pre_build_hook +++ b/src/fuel-plugin/pre_build_hook @@ -14,11 +14,21 @@ function build_pkg { case $1 in ubuntu) rm -rf ${DIR}/repositories/ubuntu; mkdir -p ${DIR}/repositories/ubuntu + + rm -rf ${DIR}/build; mkdir -p ${DIR}/build; cd ${DIR}/build; + git clone https://github.com/openstack/collectd-ceilometer-plugin cd collectd-ceilometer-plugin git checkout 3a4a1087566d1f9e8dd2d8d2e0608cb975942446 + cat << EOF > collectd_ceilometer/__init__.py +"""Collectd Ceilometer plugin implementation""" +EOF tar cfvz ${DIR}/repositories/ubuntu/collectd-ceilometer.tgz . --exclude=collectd-ceilometer.tgz - cd ..; rm -rf collectd-ceilometer-plugin + + cd ${DIR}/build; ../build-collectd.sh + cp *.deb ${DIR}/repositories/ubuntu + + rm -rf ${DIR}/build ;; *) echo "Not supported system"; exit 1;; esac |