Use rpc from openstack-common.

Final patch for blueprint common-rpc.

This patch removes nova.rpc in favor of the copy in openstack-common.

Change-Id: I9c2f6bdbe8cd0c44417f75284131dbf3c126d1dd

7 files changed, 8 insertions, 8 deletions

diff --git a/bin/nova-clear-rabbit-queues b/bin/nova-clear-rabbit-queues
index 578681790..aff9da14e 100755
--- a/bin/nova-clear-rabbit-queues
+++ b/bin/nova-clear-rabbit-queues
@@ -45,7 +45,7 @@ from nova import exception
 from nova import flags
 from nova import log as logging
 from nova.openstack.common import cfg
-from nova import rpc
+from nova.openstack.common import rpc
 
 
 delete_exchange_opt = cfg.BoolOpt('delete_exchange',
diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge
index f30a0877e..d5179d074 100755
--- a/bin/nova-dhcpbridge
+++ b/bin/nova-dhcpbridge
@@ -41,7 +41,7 @@ from nova import flags
 from nova import log as logging
 from nova.network import linux_net
 from nova.openstack.common import importutils
-from nova import rpc
+from nova.openstack.common import rpc
 from nova import utils
 
 FLAGS = flags.FLAGS
diff --git a/bin/nova-instance-usage-audit b/bin/nova-instance-usage-audit
index 3d60edfec..9fc71db05 100755
--- a/bin/nova-instance-usage-audit
+++ b/bin/nova-instance-usage-audit
@@ -56,7 +56,7 @@ from nova import db
 from nova import exception
 from nova import flags
 from nova import log as logging
-from nova import rpc
+from nova.openstack.common import rpc
 from nova import utils
 
 
diff --git a/bin/nova-manage b/bin/nova-manage
index 6bda2ada5..ece879418 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -90,9 +90,9 @@ from nova import log as logging
 from nova.openstack.common import cfg
 from nova.openstack.common import importutils
 from nova.openstack.common import jsonutils
+from nova.openstack.common import rpc
 from nova.openstack.common import timeutils
 from nova import quota
-from nova import rpc
 from nova.scheduler import rpcapi as scheduler_rpcapi
 from nova import utils
 from nova import version
diff --git a/bin/nova-rpc-zmq-receiver b/bin/nova-rpc-zmq-receiver
index 76b67a840..2fe569b77 100755
--- a/bin/nova-rpc-zmq-receiver
+++ b/bin/nova-rpc-zmq-receiver
@@ -35,8 +35,8 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')):
 
 from nova import exception
 from nova.openstack.common import cfg
-from nova import rpc
-from nova.rpc import impl_zmq
+from nova.openstack.common import rpc
+from nova.openstack.common.rpc import impl_zmq
 from nova import utils
 
 CONF = cfg.CONF
diff --git a/bin/nova-volume-usage-audit b/bin/nova-volume-usage-audit
index 2c01da56f..aff650aa4 100755
--- a/bin/nova-volume-usage-audit
+++ b/bin/nova-volume-usage-audit
@@ -55,7 +55,7 @@ from nova import db
 from nova import exception
 from nova import flags
 from nova import log as logging
-from nova import rpc
+from nova.openstack.common import rpc
 from nova import utils
 from nova.volume import utils as volume_utils
 
diff --git a/bin/nova-xvpvncproxy b/bin/nova-xvpvncproxy
index bdbe20997..1e3708072 100755
--- a/bin/nova-xvpvncproxy
+++ b/bin/nova-xvpvncproxy
@@ -33,7 +33,7 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
 
 from nova import flags
 from nova import log as logging
-from nova import rpc
+from nova.openstack.common import rpc
 from nova import service
 from nova.vnc import xvp_proxy