openstack/neutron
Code Issues Proposed changes

Merge "Centralize oslo.service patching"

Browse Source
This commit is contained in:
Zuul
2025-11-25 14:02:03 +00:00
committed by Gerrit Code Review
parent 54ec5e6dc6 cdac238f9a
commit 2ade46584b
11 changed files with 79 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
neutron/cmd/agents/__init__.py
View File

@@ -0,0 +1,17 @@
# 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.
from oslo_service import backend as oslo_service_backend
# NOTE(ralonsoh): remove once the default backend is ``BackendType.THREADING``
oslo_service_backend.init_backend(oslo_service_backend.BackendType.THREADING)

10
neutron/cmd/agents/dhcp.py
View File

@@ -10,14 +10,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo_service import backend import setproctitle
backend.init_backend(backend.BackendType.THREADING)
# pylint: disable=wrong-import-position from neutron.agent import dhcp_agent
import setproctitle # noqa: E402 from neutron_lib import constants
from neutron.agent import dhcp_agent # noqa: E402
from neutron_lib import constants # noqa: E402
def main(): def main():

11
neutron/cmd/agents/l3.py
View File

@@ -10,15 +10,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# NOTE(ralonsoh): remove once the default backend is ``BackendType.THREADING`` import setproctitle
from oslo_service import backend as oslo_service_backend
oslo_service_backend.init_backend(oslo_service_backend.BackendType.THREADING)
# pylint: disable=wrong-import-position from neutron.agent import l3_agent
import setproctitle # noqa: E402 from neutron_lib import constants
from neutron.agent import l3_agent # noqa: E402
from neutron_lib import constants # noqa: E402
def main(): def main():

11
neutron/cmd/agents/metadata.py
View File

@@ -10,15 +10,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# NOTE(haleyb): remove once the default backend is ``BackendType.THREADING`` import setproctitle
from oslo_service import backend as oslo_service_backend
oslo_service_backend.init_backend(oslo_service_backend.BackendType.THREADING)
# pylint: disable=wrong-import-position from neutron.agent import metadata_agent
import setproctitle # noqa: E402 from neutron_lib import constants
from neutron.agent import metadata_agent # noqa: E402
from neutron_lib import constants # noqa: E402
def main(): def main():

11
neutron/cmd/agents/ovn_metadata.py
View File

@@ -10,15 +10,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# NOTE(haleyb): remove once the default backend is ``BackendType.THREADING`` import setproctitle
from oslo_service import backend as oslo_service_backend
oslo_service_backend.init_backend(oslo_service_backend.BackendType.THREADING)
# pylint: disable=wrong-import-position from neutron.agent.ovn import metadata_agent
import setproctitle # noqa: E402 from neutron_lib import constants
from neutron.agent.ovn import metadata_agent # noqa: E402
from neutron_lib import constants # noqa: E402
def main(): def main():

14
neutron/cmd/agents/ovn_neutron_agent.py
View File

@@ -10,20 +10,14 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# NOTE(haleyb): remove once the default backend is ``BackendType.THREADING`` import setproctitle
from oslo_service import backend as oslo_service_backend
oslo_service_backend.init_backend(oslo_service_backend.BackendType.THREADING)
# pylint: disable=wrong-import-position from neutron.agent.ovn import ovn_neutron_agent
import setproctitle # noqa: E402 from neutron_lib import constants
from neutron_lib import constants as lib_constants # noqa: E402
from neutron.agent.ovn import ovn_neutron_agent # noqa: E402
def main(): def main():
proctitle = "{} ({})".format(lib_constants.AGENT_PROCESS_OVN, proctitle = "{} ({})".format(constants.AGENT_PROCESS_OVN,
setproctitle.getproctitle()) setproctitle.getproctitle())
setproctitle.setproctitle(proctitle) setproctitle.setproctitle(proctitle)
ovn_neutron_agent.main() ovn_neutron_agent.main()

19
neutron/cmd/agents/ovs_neutron_agent.py
View File

@@ -13,23 +13,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# NOTE(ralonsoh): remove once the default backend is ``BackendType.THREADING`` import setproctitle
import os
from oslo_service import backend as oslo_service_backend import neutron.plugins.ml2.drivers.openvswitch.agent.main as agent_main
oslo_service_backend.init_backend(oslo_service_backend.BackendType.THREADING) from neutron_lib import constants
# NOTE: the environment variable "OSKEN_HUB_TYPE" defines the ``os-ken``
# hub type to be used. The default value is now "eventlet". Once the
# default value is set to "native", we will remove the following line.
os.environ['OSKEN_HUB_TYPE'] = 'native'
# pylint: disable=wrong-import-position, line-too-long
import setproctitle # noqa: E402
import neutron.plugins.ml2.drivers.openvswitch.agent.main as agent_main # noqa: E402,E501
from neutron_lib import constants # noqa: E402
def main(): def main():

19
neutron/cmd/plugins/__init__.py
View File

@@ -0,0 +1,19 @@
# All Rights Reserved.
#
# 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.
# NOTE(ralonsoh): remove once the default backend is ``BackendType.THREADING``
from oslo_service import backend as oslo_service_backend
oslo_service_backend.init_backend(oslo_service_backend.BackendType.THREADING)

13
neutron/cmd/plugins/macvtap_neutron_agent.py
View File

@@ -12,16 +12,11 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# NOTE(ralonsoh): remove once the default backend is ``BackendType.THREADING`` import setproctitle
from oslo_service import backend as oslo_service_backend
oslo_service_backend.init_backend(oslo_service_backend.BackendType.THREADING)
# pylint: disable=wrong-import-position from neutron.plugins.ml2.drivers.macvtap.agent import macvtap_neutron_agent \
import setproctitle # noqa: E402 as agent_main
from neutron_lib import constants
from neutron.plugins.ml2.drivers.macvtap.agent import ( # noqa: E402
macvtap_neutron_agent as agent_main)
from neutron_lib import constants # noqa: E402
def main(): def main():

17
neutron/cmd/services/__init__.py
View File

@@ -0,0 +1,17 @@
# 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.
# NOTE(ralonsoh): remove once the default backend is ``BackendType.THREADING``
from oslo_service import backend as oslo_service_backend
oslo_service_backend.init_backend(oslo_service_backend.BackendType.THREADING)

11
neutron/cmd/services/metering_agent.py
View File

@@ -10,15 +10,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# NOTE(ralonsoh): remove once the default backend is ``BackendType.THREADING`` import setproctitle
from oslo_service import backend as oslo_service_backend
oslo_service_backend.init_backend(oslo_service_backend.BackendType.THREADING)
# pylint: disable=wrong-import-position from neutron.services.metering.agents import metering_agent
import setproctitle # noqa: E402 from neutron_lib import constants
from neutron.services.metering.agents import metering_agent # noqa: E402
from neutron_lib import constants # noqa: E402
def main(): def main():