summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile2
-rw-r--r--src/collectd-openstack-plugins/Makefile (renamed from src/collectd-ceilometer-plugin/Makefile)4
-rw-r--r--src/package-list.mk2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile
index 382acefc..e7a472c1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -38,6 +38,6 @@ SUBDIRS += dpdk
SUBDIRS += libpqos
SUBDIRS += pmu-tools
SUBDIRS += collectd
-SUBDIRS += collectd-ceilometer-plugin
+SUBDIRS += collectd-openstack-plugins
include mk/make-subsys.mk
diff --git a/src/collectd-ceilometer-plugin/Makefile b/src/collectd-openstack-plugins/Makefile
index a8b8f938..96bbebb8 100644
--- a/src/collectd-ceilometer-plugin/Makefile
+++ b/src/collectd-openstack-plugins/Makefile
@@ -25,7 +25,7 @@ include ../package-list.mk
.PHONY: force_make install
-WORK_DIR = collectd-ceilometer-plugin
+WORK_DIR = collectd-openstack-plugins
TAG_DONE_FLAG = $(WORK_DIR)/.$(COLLECTD_OPENSTACK_TAG).tag.done
all: force_make install
@@ -59,5 +59,5 @@ sanity:
@echo "Make sanity in $(WORK_DIR) (stub) "
$(WORK_DIR):
- $(AT)git clone $(COLLECTD_OPENSTACK_URL)
+ $(AT)git clone $(COLLECTD_OPENSTACK_URL) $(WORK_DIR)
diff --git a/src/package-list.mk b/src/package-list.mk
index 762b4230..e857dcf8 100644
--- a/src/package-list.mk
+++ b/src/package-list.mk
@@ -19,4 +19,4 @@ COLLECTD_URL ?= https://github.com/collectd/collectd
COLLECTD_TAG ?= master
COLLECTD_OPENSTACK_URL ?= https://github.com/openstack/collectd-ceilometer-plugin
-COLLECTD_OPENSTACK_TAG ?= stable/ocata
+COLLECTD_OPENSTACK_TAG ?= stable/pike