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>

diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
index 22a99ab..b7d1594 100644 (file)
--- 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 17bc36d..bb4b19c 100644 (file)
--- 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 0106213..5bf1368 100644 (file)
--- 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