From ffea2f5cd77bd7914fd1f9ffe2eaf4ae3836ca26 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Mon, 25 Jun 2012 14:47:48 +0200 Subject: [PATCH] Fallback on nova.rpc for Essex Change-Id: I2a1ca5a0c77900d2310b4534f92da885fa27f430 Signed-off-by: Julien Danjou --- ceilometer/collector/manager.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ceilometer/collector/manager.py b/ceilometer/collector/manager.py index ba310af84..d63ef96ad 100644 --- a/ceilometer/collector/manager.py +++ b/ceilometer/collector/manager.py @@ -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__)