From 02bbb044651ff4af4d63cc12a2c32ce7e7fbfb27 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Thu, 7 Sep 2017 12:25:56 +0000 Subject: src: COLLECTD_CEILOMETER_* -> COLLECTD_OPENSTACK_* Since Ceilometer support was removed from the collectd-ceilometer-plugin[1] so references to collectd-ceilometer-plugin are misleading. This change updates variables COLLECTD_CEILOMETER_* -> COLLECTD_OPENSTACK_* [1] https://review.openstack.org/#/c/490823/ This is an "internal" change, independant of repo rename Change-Id: I1247b59070fcb1eb378d9c702ddf9df0c26da878 Signed-off-by: Emma Foley --- src/collectd-ceilometer-plugin/Makefile | 12 ++++++------ src/package-list.mk | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/collectd-ceilometer-plugin/Makefile b/src/collectd-ceilometer-plugin/Makefile index 20461e50..a8b8f938 100644 --- a/src/collectd-ceilometer-plugin/Makefile +++ b/src/collectd-ceilometer-plugin/Makefile @@ -1,7 +1,7 @@ -# makefile to manage COLLECTD_CEILOMETER package +# makefile to manage COLLECTD_OPENSTACK package # -# Copyright 2015-2016 OPNFV +# 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. @@ -25,8 +25,8 @@ include ../package-list.mk .PHONY: force_make install -WORK_DIR = collectd-ceilometer-plugin -TAG_DONE_FLAG = $(WORK_DIR)/.$(COLLECTD_CEILOMETER_TAG).tag.done +WORK_DIR = collectd-ceilometer-plugin +TAG_DONE_FLAG = $(WORK_DIR)/.$(COLLECTD_OPENSTACK_TAG).tag.done all: force_make install @echo "Finished making $(WORK_DIR) " @@ -35,7 +35,7 @@ INSTALL_TARGET = force_make force_make: $(WORK_DIR) @echo "force make" - $(AT)cd $(WORK_DIR) && git checkout $(COLLECTD_CEILOMETER_TAG) + $(AT)cd $(WORK_DIR) && git checkout $(COLLECTD_OPENSTACK_TAG) @echo "Make done" install: @@ -59,5 +59,5 @@ sanity: @echo "Make sanity in $(WORK_DIR) (stub) " $(WORK_DIR): - $(AT)git clone $(COLLECTD_CEILOMETER_URL) + $(AT)git clone $(COLLECTD_OPENSTACK_URL) diff --git a/src/package-list.mk b/src/package-list.mk index 401bd72c..885edec9 100644 --- a/src/package-list.mk +++ b/src/package-list.mk @@ -15,5 +15,5 @@ LIBPQOS_TAG ?= master COLLECTD_URL ?= https://github.com/collectd/collectd COLLECTD_TAG ?= master -COLLECTD_CEILOMETER_URL ?= https://github.com/openstack/collectd-ceilometer-plugin -COLLECTD_CEILOMETER_TAG ?= stable/ocata +COLLECTD_OPENSTACK_URL ?= https://github.com/openstack/collectd-ceilometer-plugin +COLLECTD_OPENSTACK_TAG ?= stable/ocata -- cgit 1.2.3-korg