]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Code Review / openstack-build / neutron-build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: da72b26)
Removed local modification in incubator code
authorIhar Hrachyshka <ihrachys@redhat.com>
Thu, 12 Jun 2014 14:01:19 +0000 (16:01 +0200)
committerIhar Hrachyshka <ihrachys@redhat.com>
Fri, 20 Jun 2014 18:44:53 +0000 (20:44 +0200)
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 patch | blob | history

diff --git a/neutron/openstack/common/service.py b/neutron/openstack/common/service.py
index 4575de4b475c286e8c7a853253e34c1fc2a5e8d6..79ae9bc5d0dcae51be3244e2a116dc575bd732a3 100644 (file)
--- 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__)