summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/fuel-plugin/README.md12
-rwxr-xr-xsrc/fuel-plugin/pre_build_hook7
-rwxr-xr-xsrc/fuel-plugin/vagrant/build_fuel_plugin.sh2
3 files changed, 12 insertions, 9 deletions
diff --git a/src/fuel-plugin/README.md b/src/fuel-plugin/README.md
index 8ba97f6..cbe19e5 100644
--- a/src/fuel-plugin/README.md
+++ b/src/fuel-plugin/README.md
@@ -2,7 +2,7 @@ plugin-collectd-ceilometer
=========================
Plugin description
-Installs collectd-ceilometer on base-os node via a fuel plugin.
+Installs collectd-ceilometer on compute via a fuel plugin.
Requirements
------------
@@ -56,4 +56,12 @@ a) connection aborted
root@node-11:~# ceilometer sample-list --meter interface.if_packets
('Connection aborted.', BadStatusLine("''",))
- workaround: sudo service ceilometer-api restart
+ workaround:
+ root@node-11:~# sudo service ceilometer-api restart
+
+b) Service Unavailable
+ root@node-11:~# ceilometer sample-list --meter interface.if_packets
+Service Unavailable (HTTP 503)
+
+ workaround:
+ root@node-11:~# sudo service ceilometer-api restart
diff --git a/src/fuel-plugin/pre_build_hook b/src/fuel-plugin/pre_build_hook
index ffb4934..9cd8ddc 100755
--- a/src/fuel-plugin/pre_build_hook
+++ b/src/fuel-plugin/pre_build_hook
@@ -14,15 +14,10 @@ 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
+ git checkout 6c7cb6adf86fcaa6028ca42867ddcb0582111ab1
tar cfvz ${DIR}/repositories/ubuntu/collectd-ceilometer.tgz . --exclude=collectd-ceilometer.tgz
cd ${DIR}/build; ../build-collectd.sh
diff --git a/src/fuel-plugin/vagrant/build_fuel_plugin.sh b/src/fuel-plugin/vagrant/build_fuel_plugin.sh
index a42217f..5fdf9c3 100755
--- a/src/fuel-plugin/vagrant/build_fuel_plugin.sh
+++ b/src/fuel-plugin/vagrant/build_fuel_plugin.sh
@@ -4,7 +4,7 @@ sudo apt-get install -y ruby-dev rubygems-integration python-pip rpm createrepo
sudo gem install fpm
sudo pip install fuel-plugin-builder
cp -r /fuel-plugin /home/vagrant
-cd /home/vagrant/fuel-plugin;
+cd /home/vagrant/fuel-plugin;
rm -rf vagrant/.vagrant
fpb --debug --build .
cp *.rpm /vagrant