openstack/ironic
Code Issues Proposed changes

Merge "Trivial: Cleanup in neutron common code"

Browse Source
This commit is contained in:
Zuul 2024-06-11 16:57:18 +00:00 committed by Gerrit Code Review
commit 5a28e00d18
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ironic/common/neutron.py
View File

@ -297,7 +297,7 @@ def add_ports_to_network(task, network_uuid, security_groups=None):
if not ports_to_create: if not ports_to_create:
pxe_enabled = 'PXE-enabled ' if not add_all_ports else '' pxe_enabled = 'PXE-enabled ' if not add_all_ports else ''
raise exception.NetworkError(_( raise exception.NetworkError(_(
"No available %(enabled)sports on node %(node)s.") % "No available %(enabled)s ports on node %(node)s.") %
{'enabled': pxe_enabled, 'node': node.uuid}) {'enabled': pxe_enabled, 'node': node.uuid})
for ironic_port in ports_to_create: for ironic_port in ports_to_create:
@ -366,10 +366,10 @@ def add_ports_to_network(task, network_uuid, security_groups=None):
except openstack_exc.OpenStackCloudException as e: except openstack_exc.OpenStackCloudException as e:
failures.append(ironic_port.uuid) failures.append(ironic_port.uuid)
LOG.warning("Could not create neutron port for node's " LOG.warning("Could not create neutron port for node's "
"%(node)s port %(ir-port)s on the neutron " "%(node)s port %(ir_port)s on the neutron "
"network %(net)s. %(exc)s", "network %(net)s. %(exc)s",
{'net': network_uuid, 'node': node.uuid, {'net': network_uuid, 'node': node.uuid,
'ir-port': ironic_port.uuid, 'exc': e}) 'ir_port': ironic_port.uuid, 'exc': e})
else: else:
ports[ironic_port.uuid] = port.id ports[ironic_port.uuid] = port.id