Merge "Move counter_source definition"

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',
-               ),
 ]
 
 

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:
 #