Merge "Move ceilometer/cli.py to ceilometer/cmd/sample.py"

This commit is contained in:
Jenkins 2015-04-28 18:52:08 +00:00 committed by Gerrit Code Review
commit 178688b479
2 changed files with 1 additions and 7 deletions

View File

@ -20,12 +20,6 @@
import logging
import sys
import eventlet
# NOTE(jd) We need to monkey patch the socket and select module for,
# at least, oslo.messaging, otherwise everything's blocked on its
# first read() or select(), thread need to be patched too, because
# oslo.messaging use threading.local
eventlet.monkey_patch(socket=True, select=True, thread=True)
from oslo_config import cfg
from oslo_context import context
from oslo_utils import timeutils

View File

@ -331,7 +331,7 @@ console_scripts =
ceilometer-polling = ceilometer.cmd.polling:main
ceilometer-agent-notification = ceilometer.cmd.agent_notification:main
ceilometer-agent-ipmi = ceilometer.cmd.polling:main_ipmi
ceilometer-send-sample = ceilometer.cli:send_sample
ceilometer-send-sample = ceilometer.cmd.sample:send_sample
ceilometer-dbsync = ceilometer.cmd.storage:dbsync
ceilometer-expirer = ceilometer.cmd.storage:expirer
ceilometer-rootwrap = oslo_rootwrap.cmd:main