diff --git a/neutron/agent/ovn/metadata/server.py b/neutron/agent/ovn/metadata/server.py index ddda5c78e18..d6c4e288b35 100644 --- a/neutron/agent/ovn/metadata/server.py +++ b/neutron/agent/ovn/metadata/server.py @@ -198,7 +198,7 @@ class UnixDomainMetadataProxy(object): def run(self): self.server = agent_utils.UnixDomainWSGIServer( - 'networking-ovn-metadata-agent') + 'neutron-ovn-metadata-agent') self.server.start(MetadataProxyHandler(self.conf), self.conf.metadata_proxy_socket, workers=self.conf.metadata_workers, diff --git a/neutron/plugins/ml2/drivers/ovn/agent/neutron_agent.py b/neutron/plugins/ml2/drivers/ovn/agent/neutron_agent.py index 1fab00ca524..ea4290c701a 100644 --- a/neutron/plugins/ml2/drivers/ovn/agent/neutron_agent.py +++ b/neutron/plugins/ml2/drivers/ovn/agent/neutron_agent.py @@ -121,7 +121,7 @@ class ControllerGatewayAgent(ControllerAgent): class MetadataAgent(NeutronAgent): agent_type = ovn_const.OVN_METADATA_AGENT - binary = 'networking-ovn-metadata-agent' + binary = 'neutron-ovn-metadata-agent' key = ovn_const.METADATA_LIVENESS_CHECK_EXT_ID_KEY @property diff --git a/neutron/plugins/ml2/drivers/ovn/mech_driver/mech_driver.py b/neutron/plugins/ml2/drivers/ovn/mech_driver/mech_driver.py index 6ea0cd545a1..92a6448399b 100644 --- a/neutron/plugins/ml2/drivers/ovn/mech_driver/mech_driver.py +++ b/neutron/plugins/ml2/drivers/ovn/mech_driver/mech_driver.py @@ -1091,7 +1091,7 @@ class OVNMechanismDriver(api.MechanismDriver): # the agent is not running or it crashed. We'll complete the # provisioning block though. LOG.warning("Metadata service is not ready for port %s, check" - " networking-ovn-metadata-agent status/logs.", + " neutron-ovn-metadata-agent status/logs.", port_id) def agent_alive(self, agent, update_db): diff --git a/neutron/tests/unit/agent/ovn/metadata/test_server.py b/neutron/tests/unit/agent/ovn/metadata/test_server.py index 18d44cf278e..93231d367ad 100644 --- a/neutron/tests/unit/agent/ovn/metadata/test_server.py +++ b/neutron/tests/unit/agent/ovn/metadata/test_server.py @@ -262,7 +262,7 @@ class TestUnixDomainMetadataProxy(base.BaseTestCase): ensure_dir.assert_called_once_with('/the', mode=0o755) server.assert_has_calls([ - mock.call('networking-ovn-metadata-agent'), + mock.call('neutron-ovn-metadata-agent'), mock.call().start(handler.return_value, '/the/path', workers=0, backlog=128, mode=0o644)]