openstack/aodh
Code Issues Proposed changes

Fallback on nova.rpc for Essex

Browse Source 
Change-Id: I2a1ca5a0c77900d2310b4534f92da885fa27f430
Signed-off-by: Julien Danjou <julien.danjou@enovance.com>
This commit is contained in:
Julien Danjou 2012-06-25 14:47:48 +02:00
parent d9faf1c204
commit ffea2f5cd7
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ceilometer/collector/manager.py
View File

@ -32,7 +32,11 @@ from ceilometer.openstack.common.rpc import dispatcher as rpc_dispatcher
# FIXME(dhellmann): There must be another way to do this.
# Import rabbit_notifier to register notification_topics flag
import nova.notifier.rabbit_notifier
import nova.openstack.common.rpc as nova_rpc
try:
import nova.openstack.common.rpc as nova_rpc
except ImportError:
# For Essex
import nova.rpc as nova_rpc
LOG = log.getLogger(__name__)