summaryrefslogtreecommitdiff
path: root/ceilometer/cmd
diff options
context:
space:
mode:
authorMehdi Abaakouk <sileht@redhat.com>2016-10-10 19:13:14 +0200
committerMehdi Abaakouk <sileht@redhat.com>2016-10-11 14:59:52 +0200
commit5901528d1280ad8555d208ef86c614afd744c7c2 (patch)
tree6a18c7e5fe31e890d7b474b8987f95435f9aa42b /ceilometer/cmd
parent5ecb2abcddc2ca07577b0186bf1ecbb8a1b0a632 (diff)
downloadceilometer-5901528d1280ad8555d208ef86c614afd744c7c2.tar.gz
collector: stop using global config
Change-Id: I36a7008e314a7e66b1d66228514d7ac2e57b5252
Diffstat (limited to 'ceilometer/cmd')
-rw-r--r--ceilometer/cmd/collector.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/ceilometer/cmd/collector.py b/ceilometer/cmd/collector.py
index 7eb5852a..aa7c7572 100644
--- a/ceilometer/cmd/collector.py
+++ b/ceilometer/cmd/collector.py
@@ -15,16 +15,14 @@
# under the License.
import cotyledon
-from oslo_config import cfg
from ceilometer import collector
from ceilometer import service
-CONF = cfg.CONF
-
def main():
- service.prepare_service()
+ conf = service.prepare_service()
sm = cotyledon.ServiceManager()
- sm.add(collector.CollectorService, workers=CONF.collector.workers)
+ sm.add(collector.CollectorService, workers=conf.collector.workers,
+ args=(conf,))
sm.run()