summaryrefslogtreecommitdiff
path: root/ceilometer/cmd
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-19 22:52:27 +0000
committerGerrit Code Review <review@openstack.org>2015-08-19 22:52:27 +0000
commita92e9c402678277616c8f45d7ca317e53f07f7af (patch)
tree5c18a9cca14211d3a318cc7937014dac4397056b /ceilometer/cmd
parenta91f30b8266dad8a5cae1d6298203fe5417594af (diff)
parent717bd7d0642bc6b7c1b0aa83df148251148a4d46 (diff)
downloadceilometer-a92e9c402678277616c8f45d7ca317e53f07f7af.tar.gz
Merge "Change and move the workers options to corresponding service section"
Diffstat (limited to 'ceilometer/cmd')
-rw-r--r--ceilometer/cmd/eventlet/agent_notification.py2
-rw-r--r--ceilometer/cmd/eventlet/collector.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/ceilometer/cmd/eventlet/agent_notification.py b/ceilometer/cmd/eventlet/agent_notification.py
index e398c2f9..08b16464 100644
--- a/ceilometer/cmd/eventlet/agent_notification.py
+++ b/ceilometer/cmd/eventlet/agent_notification.py
@@ -26,4 +26,4 @@ CONF = cfg.CONF
def main():
service.prepare_service()
os_service.launch(CONF, notification.NotificationService(),
- workers=service.get_workers('notification')).wait()
+ workers=CONF.notification.workers).wait()
diff --git a/ceilometer/cmd/eventlet/collector.py b/ceilometer/cmd/eventlet/collector.py
index 6b3af0e3..0a56a7f5 100644
--- a/ceilometer/cmd/eventlet/collector.py
+++ b/ceilometer/cmd/eventlet/collector.py
@@ -26,4 +26,4 @@ CONF = cfg.CONF
def main():
service.prepare_service()
os_service.launch(CONF, collector.CollectorService(),
- workers=service.get_workers('collector')).wait()
+ workers=CONF.collector.workers).wait()