diff --git a/doc/source/eventlet_deprecation/index.rst b/doc/source/eventlet_deprecation/index.rst index 6c18bb69f6e..9034f05a90a 100644 --- a/doc/source/eventlet_deprecation/index.rst +++ b/doc/source/eventlet_deprecation/index.rst @@ -136,8 +136,8 @@ The Neutron API consists of the following executables: .. note:: - Right now, only the API server and the OVN maintenance task are running - without eventlet. + Right now, the API server, the OVN maintenance task and the periodic workers + taks are running without eventlet. ML2/OVN diff --git a/neutron/cmd/eventlet/server/__init__.py b/neutron/cmd/eventlet/server/__init__.py index fedc2f8f4e7..6ce84ed9076 100644 --- a/neutron/cmd/eventlet/server/__init__.py +++ b/neutron/cmd/eventlet/server/__init__.py @@ -11,13 +11,8 @@ # under the License. from neutron import server -from neutron.server import periodic_eventlet from neutron.server import wsgi_eventlet def main(): server.boot_server(wsgi_eventlet.eventlet_wsgi_server) - - -def main_periodic_eventlet(): - server.boot_server(periodic_eventlet.eventlet_periodic_workers) diff --git a/neutron/cmd/server/__init__.py b/neutron/cmd/server/__init__.py index 08e85a0d946..99f4a838992 100644 --- a/neutron/cmd/server/__init__.py +++ b/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 periodic # noqa: E402 from neutron.server import rpc # noqa: E402 @@ -34,3 +35,7 @@ def main_ovn_maintenance(): def main_rpc(): server.boot_server(rpc.rpc_server) + + +def main_periodic(): + server.boot_server(periodic.periodic_workers) diff --git a/neutron/server/periodic_eventlet.py b/neutron/server/periodic.py similarity index 92% rename from neutron/server/periodic_eventlet.py rename to neutron/server/periodic.py index 5de6b926bf9..ae7f36b469f 100644 --- a/neutron/server/periodic_eventlet.py +++ b/neutron/server/periodic.py @@ -23,8 +23,8 @@ from neutron import service LOG = log.getLogger(__name__) -def eventlet_periodic_workers(): - LOG.info('Eventlet based periodic workers process starting...') +def periodic_workers(): + LOG.info('Periodic workers process starting...') try: manager.init() diff --git a/requirements.txt b/requirements.txt index 06bc351a454..9ffc5c5e823 100644 --- a/requirements.txt +++ b/requirements.txt @@ -37,7 +37,7 @@ oslo.privsep>=2.3.0 # Apache-2.0 oslo.reports>=1.18.0 # Apache-2.0 oslo.rootwrap>=5.15.0 # Apache-2.0 oslo.serialization>=5.5.0 # Apache-2.0 -oslo.service[threading]>=4.2.0 # Apache-2.0 +oslo.service[threading]>=4.2.1 # Apache-2.0 oslo.upgradecheck>=1.3.0 # Apache-2.0 oslo.utils>=7.3.0 # Apache-2.0 oslo.versionedobjects>=1.35.1 # Apache-2.0 diff --git a/setup.cfg b/setup.cfg index e219487da1b..4c2350e797c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -50,7 +50,7 @@ console_scripts = neutron-metering-agent = neutron.cmd.services.metering_agent:main neutron-sriov-nic-agent = neutron.cmd.plugins.sriov_nic_neutron_agent:main neutron-sanity-check = neutron.cmd.sanity_check:main - neutron-periodic-workers = neutron.cmd.eventlet.server:main_periodic_eventlet + neutron-periodic-workers = neutron.cmd.server:main_periodic neutron-status = neutron.cmd.status:main neutron-ovn-agent = neutron.cmd.agents.ovn_neutron_agent:main neutron-ovn-maintenance-worker = neutron.cmd.server:main_ovn_maintenance