openstack/aodh
Code Issues Proposed changes

Merge "Allow use of local conductor"

Browse Source
This commit is contained in:
Jenkins 2013-07-26 05:12:46 +00:00 committed by Gerrit Code Review
commit b015ae9535
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ceilometer/compute/nova_notifier.py
View File

@ -30,7 +30,7 @@ import ceilometer # noqa
for name in ['openstack', 'openstack.common', 'openstack.common.log']:
sys.modules['ceilometer.' + name] = sys.modules['nova.' + name]
from nova.conductor import api
from nova import conductor
from stevedore import extension
@ -46,7 +46,7 @@ from ceilometer.openstack.common.gettextutils import _
LOG = logging.getLogger('nova.ceilometer.notifier')
_gatherer = None
instance_info_source = api.API()
instance_info_source = conductor.API()
class DeletedInstanceStatsGatherer(object):