[eventlet-removal] Remove the usage of eventlet from the RPC worker

Related-Bug: #2087953
Change-Id: I9e5d7c005468d926222eaf14abd14333cf024fbf

neutron/cmd/eventlet/server/__init__.py

@@ -12,7 +12,6 @@
 
 from neutron import server
 from neutron.server import periodic_eventlet
-from neutron.server import rpc_eventlet
 from neutron.server import wsgi_eventlet
 
 
@@ -20,9 +19,5 @@ def main():
     server.boot_server(wsgi_eventlet.eventlet_wsgi_server)
 
 
-def main_rpc_eventlet():
-    server.boot_server(rpc_eventlet.eventlet_rpc_server)
-
-
 def main_periodic_eventlet():
     server.boot_server(periodic_eventlet.eventlet_periodic_workers)

neutron/cmd/server/__init__.py

@@ -21,6 +21,7 @@ service.init_backend(service.BackendType.THREADING)
 from neutron import server  # noqa: E402
 from neutron.server import api  # noqa: E402
 from neutron.server import ovn_maintenance  # noqa: E402
+from neutron.server import rpc  # noqa: E402
 
 
 def main_api_uwsgi():
@@ -29,3 +30,7 @@ def main_api_uwsgi():
 
 def main_ovn_maintenance():
     return server.boot_server(ovn_maintenance.ovn_maintenance_worker)
+
+
+def main_rpc():
+    server.boot_server(rpc.rpc_server)

neutron/server/rpc.py

@@ -27,8 +27,8 @@ from neutron import service
 LOG = log.getLogger(__name__)
 
 
-def eventlet_rpc_server():
-    LOG.info("Eventlet based AMQP RPC server starting...")
+def rpc_server():
+    LOG.info("AMQP RPC server starting...")
 
     try:
         manager.init()

setup.cfg

@@ -43,7 +43,7 @@ console_scripts =
     neutron-openvswitch-agent = neutron.cmd.eventlet.plugins.ovs_neutron_agent:main
     neutron-ovs-cleanup = neutron.cmd.ovs_cleanup:main
     neutron-server = neutron.cmd.eventlet.server:main
-    neutron-rpc-server = neutron.cmd.eventlet.server:main_rpc_eventlet
+    neutron-rpc-server = neutron.cmd.server:main_rpc
     neutron-rootwrap = oslo_rootwrap.cmd:main
     neutron-rootwrap-daemon = oslo_rootwrap.cmd:daemon
     neutron-usage-audit = neutron.cmd.usage_audit:main