openstack
/
panko
Code Issues Proposed changes

Merge "Fallback on nova.rpc for Essex"

This commit is contained in:
Jenkins 2012-06-26 18:01:03 +00:00 committed by Gerrit Code Review
parent 3c01ccefd5 ffea2f5cd7
commit b3a11dbf7b
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__)