From 0c699c739aa3a804bcdb761ac46d5c9915097c1e Mon Sep 17 00:00:00 2001
From: Emma Foley <emma.l.foley@intel.com>
Date: Thu, 7 Sep 2017 13:21:36 +0000
Subject: src: rename dir - collectd-ceilometer-plugin/ ->
 collectd-openstack-plugin/

Updating the directory to keep naming consistent
with project rename [1] i.e. no specific mention of
ceilometer.

[1] https://review.openstack.org/#/c/500768/

This is an "internal" change, independant of repo rename

Change-Id: I6cf22c081aa1e40f64995be40b6225855faf4092
Signed-off-by: Emma Foley <emma.l.foley@intel.com>
---
 src/Makefile                            |  2 +-
 src/collectd-ceilometer-plugin/Makefile | 63 ---------------------------------
 src/collectd-openstack-plugins/Makefile | 63 +++++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 64 deletions(-)
 delete mode 100644 src/collectd-ceilometer-plugin/Makefile
 create mode 100644 src/collectd-openstack-plugins/Makefile

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-ceilometer-plugin/Makefile
deleted file mode 100644
index a8b8f938..00000000
--- a/src/collectd-ceilometer-plugin/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-# makefile to manage COLLECTD_OPENSTACK package
-#
-
-# Copyright 2015-2017 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_OPENSTACK_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 checkout $(COLLECTD_OPENSTACK_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_OPENSTACK_URL)
-
diff --git a/src/collectd-openstack-plugins/Makefile b/src/collectd-openstack-plugins/Makefile
new file mode 100644
index 00000000..96bbebb8
--- /dev/null
+++ b/src/collectd-openstack-plugins/Makefile
@@ -0,0 +1,63 @@
+# makefile to manage COLLECTD_OPENSTACK package
+#
+
+# Copyright 2015-2017 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-openstack-plugins
+TAG_DONE_FLAG = $(WORK_DIR)/.$(COLLECTD_OPENSTACK_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 checkout $(COLLECTD_OPENSTACK_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_OPENSTACK_URL) $(WORK_DIR)
+
-- 
cgit 1.2.3-korg