bugfix: collectd with dpdk and collectd-ceilometer

Change-Id: I6e78625b74b9588ce24db2bde7523dc4c1dd5d6e
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>

diff --git a/src/Makefile b/src/Makefile
index 1b0157a..73e3508 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -36,5 +36,6 @@ include mk/master.mk
 SUBDIRS =
 SUBDIRS += dpdk
 SUBDIRS += collectd
+SUBDIRS += collectd-ceilometer-plugin
 
 include mk/make-subsys.mk

diff --git a/src/collectd-ceilometer-plugin/Makefile b/src/collectd-ceilometer-plugin/Makefile
new file mode 100644 (file)
index 0000000..b0ad411
--- /dev/null
+++ b/src/collectd-ceilometer-plugin/Makefile
@@ -0,0 +1,63 @@
+# makefile to manage COLLECTD_CEILOMETER package
+#
+
+# Copyright 2015-2016 OPNFV
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# Contributors:
+#   Aihua Li, Huawei Technologies.
+#   Martin Klozik, Intel Corporation.
+
+include ../mk/master.mk
+include ../package-list.mk
+
+.PHONY: force_make install
+
+WORK_DIR = collectd-ceilometer-plugin 
+TAG_DONE_FLAG = $(WORK_DIR)/.$(COLLECTD_CEILOMETER_TAG).tag.done
+
+all: force_make install
+       @echo "Finished making $(WORK_DIR) "
+
+INSTALL_TARGET = force_make
+
+force_make: $(WORK_DIR)
+       @echo "force make"
+       $(AT)cd $(WORK_DIR) && git pull $(COLLECTD_CEILOMETER_URL) $(COLLECTD_CEILOMETER_TAG)
+       @echo "Make done"
+
+install:
+       @echo "install done"
+
+# hard way to clean and clobber
+clean:
+       $(AT)cd $(WORK_DIR) && git clean -xfd *.o
+clobber:
+       $(AT)rm -rf $(WORK_DIR)
+
+# distclean is for developer who would like to keep the
+# clone git repo, saving time to fetch again from url
+distclean:
+       $(AT)cd $(WORK_DIR) && git clean -xfd && git checkout -f
+
+test:
+       @echo "Make test in $(WORK_DIR) (stub) "
+
+sanity:
+       @echo "Make sanity in $(WORK_DIR) (stub) "
+
+$(WORK_DIR):
+       $(AT)git clone $(COLLECTD_CEILOMETER_URL)
+

diff --git a/src/collectd/Makefile b/src/collectd/Makefile
index 255859e..2233149 100644 (file)
--- a/src/collectd/Makefile
+++ b/src/collectd/Makefile
@@ -94,7 +94,7 @@ $(WORK_DIR):
        $(AT)git clone $(COLLECTD_URL)
 
 $(TAG_DONE_FLAG): $(WORK_DIR)
-       $(AT)cd collectd-with-DPDK; git checkout $(collectd_TAG)
+       $(AT)cd collectd-with-DPDK; git checkout $(COLLECTD_TAG)
 ifneq ($(PATCH_FILE),)
        $(AT)cd $(WORK_DIR); patch -p1 < ../$(PATCH_FILE)
 endif

diff --git a/src/package-list.mk b/src/package-list.mk
index 45b908e..93dd598 100644 (file)
--- a/src/package-list.mk
+++ b/src/package-list.mk
@@ -11,3 +11,6 @@ DPDK_TAG ?= v16.04
 # collectd section
 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