From: Thang Pham <thang.g.pham@gmail.com>
Date: Sat, 26 Jul 2014 00:53:02 +0000 (-0400)
Subject: Remove cinder-rpc-zmq-receiver
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d384beef271185ac228794b96e8f7b8596ec8d4f;p=openstack-build%2Fcinder-build.git

Remove cinder-rpc-zmq-receiver

cinder-rpc-zmq-receiver should be removed as part of the switch to
oslo.messaging. It is now replaced with oslo-messaging-zmq-receiver.

Change-Id: I1fd7d7571bb5660bf77e7664f35052db29ebea57
Closes-Bug: #1348856
---

diff --git a/bin/cinder-rpc-zmq-receiver b/bin/cinder-rpc-zmq-receiver
deleted file mode 100755
index cd7d94a8f..000000000
--- a/bin/cinder-rpc-zmq-receiver
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env python
-#    Copyright 2011 OpenStack Foundation
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-import eventlet
-eventlet.monkey_patch()
-
-import contextlib
-import os
-import sys
-import warnings
-
-warnings.simplefilter('once', DeprecationWarning)
-
-# If ../cinder/__init__.py exists, add ../ to Python search path, so that
-# it will override what happens to be installed in /usr/(local/)lib/python...
-POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
-                                   os.pardir,
-                                   os.pardir))
-if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'cinder', '__init__.py')):
-    sys.path.insert(0, POSSIBLE_TOPDIR)
-
-from oslo.config import cfg
-
-from cinder.openstack.common import log as logging
-from cinder.openstack.common import rpc
-from cinder.openstack.common.rpc import impl_zmq
-
-CONF = cfg.CONF
-CONF.register_opts(rpc.rpc_opts)
-CONF.register_opts(impl_zmq.zmq_opts)
-
-
-def main():
-    CONF(sys.argv[1:], project='cinder')
-    logging.setup("cinder")
-
-    with contextlib.closing(impl_zmq.ZmqProxy(CONF)) as reactor:
-        reactor.consume_in_thread()
-        reactor.wait()
-
-if __name__ == '__main__':
-    main()
diff --git a/setup.cfg b/setup.cfg
index 82d201f19..4bb1858ee 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -31,7 +31,6 @@ scripts =
     bin/cinder-backup
     bin/cinder-clear-rabbit-queues
     bin/cinder-manage
-    bin/cinder-rpc-zmq-receiver
     bin/cinder-rtstool
     bin/cinder-scheduler
     bin/cinder-volume