summaryrefslogtreecommitdiffstats
path: root/src/fuel-plugin
diff options
context:
space:
mode:
authorMaryam Tahhan <maryam.tahhan@intel.com>2016-12-14 11:19:02 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-12-14 11:19:02 +0000
commit9864e17ff636d7fffe39e0a4b68a370ab7cb9f58 (patch)
tree5b82bcdd054d968616a67709e0e790b49196ec17 /src/fuel-plugin
parent60fa6b4a1116e361a6dbda516679610165dc320d (diff)
parent9a00ce2a39b9c62f1e3605fea3f2642e17b44d24 (diff)
Merge "Build collectd in ubuntu 16.04 docker"
Diffstat (limited to 'src/fuel-plugin')
-rw-r--r--src/fuel-plugin/Dockerfile8
-rwxr-xr-xsrc/fuel-plugin/build-collectd.sh5
-rwxr-xr-xsrc/fuel-plugin/deployment_scripts/install.sh2
-rwxr-xr-xsrc/fuel-plugin/pre_build_hook15
-rwxr-xr-xsrc/fuel-plugin/vagrant/build_fuel_plugin.sh2
5 files changed, 21 insertions, 11 deletions
diff --git a/src/fuel-plugin/Dockerfile b/src/fuel-plugin/Dockerfile
new file mode 100644
index 00000000..301d796a
--- /dev/null
+++ b/src/fuel-plugin/Dockerfile
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+FROM ubuntu:16.04
+
+RUN apt-get update -y
+RUN apt-get install -y sudo
+
+ADD ./build-collectd.sh /build-collectd.sh
diff --git a/src/fuel-plugin/build-collectd.sh b/src/fuel-plugin/build-collectd.sh
index 3eefa635..0ef3136d 100755
--- a/src/fuel-plugin/build-collectd.sh
+++ b/src/fuel-plugin/build-collectd.sh
@@ -64,8 +64,8 @@ sudo apt-get -y install \
cd ${BUILD_HOME}
rm -rf 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
+git clone https://github.com/collectd/collectd; cd collectd; git checkout 797ed5e5bee9ee89361f12e447ffc6ceb6ef79d2
+git clone https://github.com/collectd/pkg-debian; cd pkg-debian; git checkout 549d3caba74210ad762fe8c556801d9c11ab9876
mv debian ..
cd ${BUILD_HOME}/collectd
@@ -73,3 +73,4 @@ cd ${BUILD_HOME}/collectd
debian/rules build || true
debian/rules build
fakeroot debian/rules binary
+cp ${BUILD_HOME}/*.deb /build
diff --git a/src/fuel-plugin/deployment_scripts/install.sh b/src/fuel-plugin/deployment_scripts/install.sh
index 807e5683..0bcb4008 100755
--- a/src/fuel-plugin/deployment_scripts/install.sh
+++ b/src/fuel-plugin/deployment_scripts/install.sh
@@ -11,7 +11,7 @@ OS_PASSWORD=$4
CEILOMETER_URL_TYPE=${CEILOMETER_URL_TYPE:-internalURL}
CEILOMETER_TIMEOUT=${CEILOMETER_TIMEOUT:-1000}
-apt-get install -y collectd
+apt-get install -y collectd python-dev libpython2.7
rm -rf $INSTALL_HOME; mkdir -p $INSTALL_HOME
cd $INSTALL_HOME
diff --git a/src/fuel-plugin/pre_build_hook b/src/fuel-plugin/pre_build_hook
index 9a539934..c0d35d4f 100755
--- a/src/fuel-plugin/pre_build_hook
+++ b/src/fuel-plugin/pre_build_hook
@@ -13,18 +13,19 @@ DIR="$(dirname `readlink -f $0`)"
function build_pkg {
case $1 in
ubuntu)
+ cd ${DIR}
rm -rf ${DIR}/repositories/ubuntu; mkdir -p ${DIR}/repositories/ubuntu
- rm -rf ${DIR}/build; mkdir -p ${DIR}/build; cd ${DIR}/build;
+ rm -rf collectd-ceilometer-plugin
git clone https://github.com/openstack/collectd-ceilometer-plugin
cd collectd-ceilometer-plugin
- git checkout 73372f2eb86c81f12bc10b392f75050a401107db
+ git checkout 73372f2eb86c81f12bc10b392f75050a401107db
tar cfvz ${DIR}/repositories/ubuntu/collectd-ceilometer.tgz . --exclude=collectd-ceilometer.tgz
+ cd ..; rm -rf collectd-ceilometer-plugin
- # support collectd with dpdk
- cd ${DIR}/build; ../build-collectd.sh
- cp *.deb ${DIR}/repositories/ubuntu
-
- rm -rf ${DIR}/build
+ # build collectd
+ cd ${DIR}
+ sudo docker build -t collectd_build .
+ sudo docker run -v${DIR}/repositories/ubuntu:/build -t collectd_build /build-collectd.sh
;;
*) echo "Not supported system"; exit 1;;
esac
diff --git a/src/fuel-plugin/vagrant/build_fuel_plugin.sh b/src/fuel-plugin/vagrant/build_fuel_plugin.sh
index 5fdf9c38..ea77b075 100755
--- a/src/fuel-plugin/vagrant/build_fuel_plugin.sh
+++ b/src/fuel-plugin/vagrant/build_fuel_plugin.sh
@@ -1,6 +1,6 @@
#!/bin/bash
sudo apt-get update -y
-sudo apt-get install -y ruby-dev rubygems-integration python-pip rpm createrepo dpkg-dev git
+sudo apt-get install -y ruby-dev rubygems-integration python-pip rpm createrepo dpkg-dev git docker.io
sudo gem install fpm
sudo pip install fuel-plugin-builder
cp -r /fuel-plugin /home/vagrant