From 1cb2adfe23b25b74ef165fd3006f19065bd32a20 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Thu, 7 Feb 2013 17:41:33 +0100 Subject: [PATCH] Move counter_source definition The source of a Counter is not tight to the collector publishing system at all, so move that a level above, otherwise code which don't import the collector will fail using this variable. Change-Id: Ie70b9b544505a8c7d9841163a7d5960cf677f3e4 Signed-off-by: Julien Danjou --- ceilometer/collector/meter.py | 4 ---- ceilometer/counter.py | 10 ++++++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ceilometer/collector/meter.py b/ceilometer/collector/meter.py index da9d7edec..74a96b848 100644 --- a/ceilometer/collector/meter.py +++ b/ceilometer/collector/meter.py @@ -29,10 +29,6 @@ METER_OPTS = [ default='change this or be hacked', help='Secret value for signing metering messages', ), - cfg.StrOpt('counter_source', - default='openstack', - help='Source for counters emited on this instance', - ), ] diff --git a/ceilometer/counter.py b/ceilometer/counter.py index 3e8749089..c4304a12b 100644 --- a/ceilometer/counter.py +++ b/ceilometer/counter.py @@ -23,6 +23,16 @@ in by the plugins that create them. """ import collections +from ceilometer.openstack.common import cfg + +OPTS = [ + cfg.StrOpt('counter_source', + default='openstack', + help='Source for counters emited on this instance'), +] + +cfg.CONF.register_opts(OPTS) + # Fields explanation: #