summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuo Ruijing <ruijing.guo@intel.com>2016-12-27 17:04:42 -0800
committerGuo Ruijing <ruijing.guo@intel.com>2016-12-27 17:29:00 -0800
commit00637083409bfa22fcee027bc7a87e75c3b50380 (patch)
tree6877c96f753f6e0fa3a031c38c61726c64ee1f70
parent74b08ee0bda8daef2b2a6244a5055f869f016a03 (diff)
Enable ceilometer collectd
1. ceilometer collectd basic functionality can work 2. will update config.mk after review #26213 is merged Change-Id: I3a115f20b176dbee93ce5d72c580c83d6b721382 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
-rw-r--r--build/f_isoroot/Makefile2
-rw-r--r--build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile23
-rw-r--r--build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk6
3 files changed, 16 insertions, 15 deletions
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
index 22a99ab10..b7d159414 100644
--- a/build/f_isoroot/Makefile
+++ b/build/f_isoroot/Makefile
@@ -11,7 +11,7 @@
# Add Fuel plugin build targets here
# Plugins disabled for the Fuel Newton uplift. Please re-enable your plugin as you have
# verified it!
-PLUGINS ?= f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild f_kvm-pluginbuild f_yardstick-pluginbuild
+PLUGINS ?= f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild f_kvm-pluginbuild f_yardstick-pluginbuild f_collectd-ceilometer-pluginbuild
export PLUGINS
NON_10-0_REBASED_PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_bgpvpn-pluginbuild
diff --git a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile
index 17bc36d91..bb4b19cc8 100644
--- a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile
+++ b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/Makefile
@@ -19,34 +19,35 @@ include config.mk
#############################################################################
.PHONY: all
-all: .fastpathmetrics
+all: .barometer
.PHONY: clean
clean:
- @rm -f .fastpathmetrics ../release/opnfv/fuel-plugin-collectd-ceilometer-*.rpm fuel-plugin-collectd-ceilometer-*.rpm
+ @rm -f .barometer ../release/opnfv/fuel-plugin-collectd-ceilometer-*.rpm fuel-plugin-collectd-ceilometer-*.rpm
@rm -f $(BUILD_BASE)/gitinfo_collectd-ceilometer-plugin.txt gitinfo_collectd-ceilometer-plugin.txt
.PHONY: release
-release:.fastpathmetrics
+release:.barometer
@rm -f ../release/opnfv/fuel-plugin-collectd-ceilometer-*.rpm
@mkdir -p ../release/opnfv
@cp fuel-plugin-collectd-ceilometer*.rpm ../release/opnfv/
cp gitinfo_collectd-ceilometer-plugin.txt $(BUILD_BASE)
-.fastpathmetrics:
- @rm -rf fastpathmetrics
+.barometer:
+ @rm -rf barometer
+ ../../docker/ubuntu-builder/install_docker.sh
git clone $(COLLECTD_CEILOMETER_REPO)
- cd fastpathmetrics; \
+ cd barometer; \
git checkout $(COLLECTD_CEILOMETER_BRANCH); \
if [ ! -z $(COLLECTD_CEILOMETER_CHANGE) ]; then \
git fetch $(COLLECTD_CEILOMETER_REPO) $(COLLECTD_CEILOMETER_CHANGE); \
git checkout FETCH_HEAD; \
fi
- fpb --debug --build fastpathmetrics/src/fuel-plugin
- @mv fastpathmetrics/src/fuel-plugin/fuel-plugin-collectd-ceilometer*.rpm .
+ fpb --debug --build barometer/src/fuel-plugin
+ @mv barometer/src/fuel-plugin/fuel-plugin-collectd-ceilometer*.rpm .
$(REPOINFO) -r . > gitinfo_collectd-ceilometer-plugin.txt
- @rm -rf fastpathmetrics
- @touch .fastpathmetrics
+ @rm -rf barometer
+ @touch .barometer
# Store artifact in cache straight away if caching is enabled
# (no .cacheid will be present unless this is a cached build)
test -f .cacheid && $(MAKE) -f Makefile put-cache || exit 0
@@ -88,4 +89,4 @@ get-cache: .cacheid
# Store cache if not already stored - called after ordinary build
.PHONY: put-cache
put-cache: .cacheid
- @tar cf - .fastpathmetrics fuel-plugin-collectd-ceilometer*.rpm gitinfo_collectd-ceilometer-plugin.txt | $(CACHETOOL) put $(shell cat .cacheid)
+ @tar cf - .barometer fuel-plugin-collectd-ceilometer*.rpm gitinfo_collectd-ceilometer-plugin.txt | $(CACHETOOL) put $(shell cat .cacheid)
diff --git a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk
index 0106213d3..5bf1368d1 100644
--- a/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk
+++ b/build/f_isoroot/f_collectd-ceilometer-pluginbuild/config.mk
@@ -8,6 +8,6 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-COLLECTD_CEILOMETER_BRANCH?=3ddf95235ef62de5fb9a520b3aa8f120518b0077
-COLLECTD_CEILOMETER_REPO?=http://gerrit.opnfv.org/gerrit/fastpathmetrics
-COLLECTD_CEILOMETER_CHANGE?=
+COLLECTD_CEILOMETER_BRANCH?=
+COLLECTD_CEILOMETER_REPO?=http://gerrit.opnfv.org/gerrit/barometer
+COLLECTD_CEILOMETER_CHANGE?=refs/changes/13/26213/7