From: Ihar Hrachyshka <ihrachys@redhat.com>
Date: Thu, 12 Jun 2014 14:01:19 +0000 (+0200)
Subject: Removed local modification in incubator code
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=5a99d489ff93d2cd93f8ed4857961580faf98a25;p=openstack-build%2Fneutron-build.git

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
---

diff --git a/neutron/openstack/common/service.py b/neutron/openstack/common/service.py
index 4575de4b4..79ae9bc5d 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__)