From 5a99d489ff93d2cd93f8ed4857961580faf98a25 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Thu, 12 Jun 2014 16:01:19 +0200 Subject: [PATCH] Removed local modification in incubator code Now that 'rpc' module is removed from the tree, we're safe to restore the original code here. blueprint oslo-messaging Change-Id: I10ee03a3e2b06cdc25bd071f3cefa06966c6ebf3 --- neutron/openstack/common/service.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/neutron/openstack/common/service.py b/neutron/openstack/common/service.py index 4575de4b475..79ae9bc5d0d 100644 --- a/neutron/openstack/common/service.py +++ b/neutron/openstack/common/service.py @@ -45,9 +45,7 @@ from neutron.openstack.common import systemd from neutron.openstack.common import threadgroup -#rpc = importutils.try_import('neutron.openstack.common.rpc') -# TODO(ihrachys): restore once oslo-rpc code is removed from the tree -rpc = None +rpc = importutils.try_import('neutron.openstack.common.rpc') CONF = cfg.CONF LOG = logging.getLogger(__name__)