From 193cc4b5ec0052abedd43748164e1502b2e733ee Mon Sep 17 00:00:00 2001 From: Lucas Alvares Gomes Date: Fri, 13 Dec 2019 10:18:42 +0000 Subject: [PATCH] [OVN] Add OVN metadata entry points This patch is migrating the entry points for the OVN metadata agent. Change-Id: I4062ade1231e29344a38cb69f32c3a0f198a7d03 Co-Authored-By: Daniel Alvarez Related-Blueprint: neutron-ovn-merge Signed-off-by: Lucas Alvares Gomes --- neutron/cmd/eventlet/agents/ovn_metadata.py | 17 +++++++++++++++++ setup.cfg | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 neutron/cmd/eventlet/agents/ovn_metadata.py diff --git a/neutron/cmd/eventlet/agents/ovn_metadata.py b/neutron/cmd/eventlet/agents/ovn_metadata.py new file mode 100644 index 00000000000..3465fa9ab28 --- /dev/null +++ b/neutron/cmd/eventlet/agents/ovn_metadata.py @@ -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 neutron.agent.ovn import metadata_agent + + +def main(): + metadata_agent.main() diff --git a/setup.cfg b/setup.cfg index 8c5f17d100d..65b26b1b93d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -28,8 +28,6 @@ data_files = scripts = bin/neutron-rootwrap-xen-dom0 -# TODO(lucasagomes): Add the metadata agent (and potentially others) -# after the networking-ovn code is migrated into neutron [entry_points] wsgi_scripts = neutron-api = neutron.server:get_application @@ -57,6 +55,7 @@ console_scripts = neutron-sriov-nic-agent = neutron.cmd.eventlet.plugins.sriov_nic_neutron_agent:main neutron-sanity-check = neutron.cmd.sanity_check:main neutron-status = neutron.cmd.status:main + neutron-ovn-metadata-agent = neutron.cmd.eventlet.agents.ovn_metadata:main neutron.core_plugins = ml2 = neutron.plugins.ml2.plugin:Ml2Plugin neutron.service_plugins = @@ -152,6 +151,7 @@ oslo.config.opts = neutron.ml2.ovs.agent = neutron.opts:list_ovs_opts neutron.ml2.sriov.agent = neutron.opts:list_sriov_agent_opts neutron.ml2.xenapi = neutron.opts:list_xenapi_opts + neutron.ovn.metadata.agent = neutron.conf.agent.ovn.metadata.config:list_metadata_agent_opts nova.auth = neutron.opts:list_auth_opts oslo.config.opts.defaults = neutron = neutron.common.config:set_cors_middleware_defaults