From c6a2daeab5ca6988b7565092516f39916a360445 Mon Sep 17 00:00:00 2001 From: Sam Morrison Date: Thu, 25 Jul 2013 21:18:31 +1000 Subject: [PATCH] Allow use of local conductor Fixes bug 1204864 Conductor API import was directly importing remote API not allowing use of use_local flag in nova. Change-Id: Ieea410ac6b90fedb6871e0f4c3d02e6a35363439 --- ceilometer/compute/nova_notifier.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ceilometer/compute/nova_notifier.py b/ceilometer/compute/nova_notifier.py index 887f56c7b..391051268 100644 --- a/ceilometer/compute/nova_notifier.py +++ b/ceilometer/compute/nova_notifier.py @@ -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):