From e18735f403c46fcba97dbe596c8c7a1aac5fbe11 Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Date: Mon, 17 Mar 2025 08:40:17 +0000 Subject: [PATCH] Revert "[eventlet-removal] Remove the usage of eventlet in the DHCP agent" This reverts commit 7c32d43c4b37ec7629b1ff191e54c389c03b6f8d. Reason for revert: the DHCP agent is still using "oslo.service". The only backend implemented so far is "eventlet" (see c#2 in LP#2101840). This revert is temporary until we have a "oslo.service" release using kernel libraries. This patch is reverted along with [1], that is proposed on top of this patch. [1]https://review.opendev.org/c/openstack/neutron/+/942393 Partial-Bug: #2101840 Change-Id: Ifd4f10a65935d9779ae4b5329258aef6bd5f871b --- neutron/cmd/{ => eventlet}/agents/dhcp.py | 0 neutron/tests/fullstack/agents/dhcp_agent.py | 2 +- setup.cfg | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename neutron/cmd/{ => eventlet}/agents/dhcp.py (100%) diff --git a/neutron/cmd/agents/dhcp.py b/neutron/cmd/eventlet/agents/dhcp.py similarity index 100% rename from neutron/cmd/agents/dhcp.py rename to neutron/cmd/eventlet/agents/dhcp.py diff --git a/neutron/tests/fullstack/agents/dhcp_agent.py b/neutron/tests/fullstack/agents/dhcp_agent.py index 3a522d48bc3..20509b1ace8 100755 --- a/neutron/tests/fullstack/agents/dhcp_agent.py +++ b/neutron/tests/fullstack/agents/dhcp_agent.py @@ -21,7 +21,7 @@ from oslo_config import cfg from oslo_utils import uuidutils from neutron.agent.linux import dhcp as linux_dhcp -from neutron.cmd.agents import dhcp as dhcp_agent +from neutron.cmd.eventlet.agents import dhcp as dhcp_agent from neutron.common import config diff --git a/setup.cfg b/setup.cfg index df3fbd62f0f..73d4b71c269 100644 --- a/setup.cfg +++ b/setup.cfg @@ -34,7 +34,7 @@ wsgi_scripts = neutron-api = neutron.cmd.server:main_api_uwsgi console_scripts = neutron-db-manage = neutron.db.migration.cli:main - neutron-dhcp-agent = neutron.cmd.agents.dhcp:main + neutron-dhcp-agent = neutron.cmd.eventlet.agents.dhcp:main neutron-keepalived-state-change = neutron.cmd.keepalived_state_change:main neutron-ipset-cleanup = neutron.cmd.ipset_cleanup:main neutron-l3-agent = neutron.cmd.eventlet.agents.l3:main