openstack/aodh
Code Issues Proposed changes

Allow use of local conductor

Browse Source 
Fixes bug 1204864

Conductor API import was directly importing remote API not allowing
use of use_local flag in nova.

Change-Id: Ieea410ac6b90fedb6871e0f4c3d02e6a35363439
This commit is contained in:
Sam Morrison 2013-07-25 21:18:31 +10:00
parent a4b1b54a48
commit c6a2daeab5
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']: for name in ['openstack', 'openstack.common', 'openstack.common.log']:
sys.modules['ceilometer.' + name] = sys.modules['nova.' + name] sys.modules['ceilometer.' + name] = sys.modules['nova.' + name]
from nova.conductor import api from nova import conductor
from stevedore import extension from stevedore import extension
@ -46,7 +46,7 @@ from ceilometer.openstack.common.gettextutils import _
LOG = logging.getLogger('nova.ceilometer.notifier') LOG = logging.getLogger('nova.ceilometer.notifier')
_gatherer = None _gatherer = None
instance_info_source = api.API() instance_info_source = conductor.API()
class DeletedInstanceStatsGatherer(object): class DeletedInstanceStatsGatherer(object):