summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/fuel-plugin/README.md14
-rwxr-xr-xsrc/fuel-plugin/pre_build_hook2
-rw-r--r--src/package-list.mk2
3 files changed, 12 insertions, 6 deletions
diff --git a/src/fuel-plugin/README.md b/src/fuel-plugin/README.md
index cbe19e59..becb10a3 100644
--- a/src/fuel-plugin/README.md
+++ b/src/fuel-plugin/README.md
@@ -21,7 +21,9 @@ Documents
Build/Deploy/Verify
-------------------
-1) install fuel plugin builder (fpb)
+step 1, 2, 3 may be bypassed if fuel plugin is installed from /opt/opnfv in fuel@opnfv.
+
+1) install fuel plugin builder
sudo apt-get install -y ruby-dev rubygems-integration python-pip rpm createrepo dpkg-dev
sudo gem install fpm
sudo pip install fuel-plugin-builder
@@ -37,9 +39,13 @@ Build/Deploy/Verify
fuel plugins --install <plugin-name>.rpm
5) prepare fuel environment
- on fuel dashboard, go to settings/other
- enable collectd-ceilometer plugin with checkbox
- save settings
+ a) enable ceilometer service
+ go to settings/openstack services
+ enable ceilometer plugin with checkbox
+ b) enable collectd-ceilometer
+ go to settings/other
+ enable collectd-ceilometer plugin with checkbox
+ c) save settings
6) add nodes to environment
diff --git a/src/fuel-plugin/pre_build_hook b/src/fuel-plugin/pre_build_hook
index 6ce27784..3cca5bd8 100755
--- a/src/fuel-plugin/pre_build_hook
+++ b/src/fuel-plugin/pre_build_hook
@@ -17,7 +17,7 @@ function build_pkg {
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 6c7cb6adf86fcaa6028ca42867ddcb0582111ab1
+ git checkout 73372f2eb86c81f12bc10b392f75050a401107db
tar cfvz ${DIR}/repositories/ubuntu/collectd-ceilometer.tgz . --exclude=collectd-ceilometer.tgz
# support collectd with dpdk later
diff --git a/src/package-list.mk b/src/package-list.mk
index 93dd5986..61d7abf1 100644
--- a/src/package-list.mk
+++ b/src/package-list.mk
@@ -13,4 +13,4 @@ COLLECTD_URL ?= https://github.com/maryamtahhan/collectd-with-DPDK
COLLECTD_TAG ?= dpdkstat
COLLECTD_CEILOMETER_URL ?= https://github.com/openstack/collectd-ceilometer-plugin
-COLLECTD_CEILOMETER_TAG ?= master
+COLLECTD_CEILOMETER_TAG ?= stable/mitaka