Rename networking-ovn-metadata-agent to neutron-ovn-metadata-agent
As described in [1], the metadata with OVN uses a new neutron agent called 'neutron-ovn-metadata-agent'. In fact, the system service is also called 'neutron-ovn-metadata-agent', so it is more reasonable to modify its name. [1] https://docs.openstack.org/networking-ovn/latest/contributor/design/metadata_api.html Change-Id: I30d0eeee51ef3352cfb21f86138d60ad35f2b6fa
This commit is contained in:
parent
de3cc88ac3
commit
ca36dbde10
|
@ -198,7 +198,7 @@ class UnixDomainMetadataProxy(object):
|
||||||
|
|
||||||
def run(self):
|
def run(self):
|
||||||
self.server = agent_utils.UnixDomainWSGIServer(
|
self.server = agent_utils.UnixDomainWSGIServer(
|
||||||
'networking-ovn-metadata-agent')
|
'neutron-ovn-metadata-agent')
|
||||||
self.server.start(MetadataProxyHandler(self.conf),
|
self.server.start(MetadataProxyHandler(self.conf),
|
||||||
self.conf.metadata_proxy_socket,
|
self.conf.metadata_proxy_socket,
|
||||||
workers=self.conf.metadata_workers,
|
workers=self.conf.metadata_workers,
|
||||||
|
|
|
@ -121,7 +121,7 @@ class ControllerGatewayAgent(ControllerAgent):
|
||||||
|
|
||||||
class MetadataAgent(NeutronAgent):
|
class MetadataAgent(NeutronAgent):
|
||||||
agent_type = ovn_const.OVN_METADATA_AGENT
|
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
|
key = ovn_const.METADATA_LIVENESS_CHECK_EXT_ID_KEY
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
|
|
@ -1091,7 +1091,7 @@ class OVNMechanismDriver(api.MechanismDriver):
|
||||||
# the agent is not running or it crashed. We'll complete the
|
# the agent is not running or it crashed. We'll complete the
|
||||||
# provisioning block though.
|
# provisioning block though.
|
||||||
LOG.warning("Metadata service is not ready for port %s, check"
|
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)
|
port_id)
|
||||||
|
|
||||||
def agent_alive(self, agent, update_db):
|
def agent_alive(self, agent, update_db):
|
||||||
|
|
|
@ -262,7 +262,7 @@ class TestUnixDomainMetadataProxy(base.BaseTestCase):
|
||||||
|
|
||||||
ensure_dir.assert_called_once_with('/the', mode=0o755)
|
ensure_dir.assert_called_once_with('/the', mode=0o755)
|
||||||
server.assert_has_calls([
|
server.assert_has_calls([
|
||||||
mock.call('networking-ovn-metadata-agent'),
|
mock.call('neutron-ovn-metadata-agent'),
|
||||||
mock.call().start(handler.return_value,
|
mock.call().start(handler.return_value,
|
||||||
'/the/path', workers=0,
|
'/the/path', workers=0,
|
||||||
backlog=128, mode=0o644)]
|
backlog=128, mode=0o644)]
|
||||||
|
|
Loading…
Reference in New Issue