openstack
/
ironic
Code Issues Proposed changes

Update wording used in removal of VIFs 

Some minor updates were done to the wording used in the
removal-of-VIFs change.  This is a follow up to
3a4e259a37.

Change-Id: I4a72535fed3650364aa53f1f22676599499a3d62
Story: #1743652
Task: #9275
This commit is contained in:
Ruby Loo 2018-04-18 02:55:44 +00:00
parent 532ceb4d65
commit 05dd4050f7
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ironic/common/network.py
View File

@ -123,23 +123,25 @@ def remove_vifs_from_node(task):
for vif_entry in vifs:
vif = vif_entry.get('id')
if not vif:
LOG.warning('Incorrect vif entry for %(node)s lacks an ID field, '
'and is thus unsupported. Found: %(found)s.',
LOG.warning('Node %(node)s has an incorrect VIF entry: %(found)s. '
'This entry lacks an "id" field and is thus '
'unsupported.',
{'node': task.node.uuid,
'found': vif_entry})
continue
try:
task.driver.network.vif_detach(task, vif)
except exception.VifNotAttached as e:
except exception.VifNotAttached:
LOG.warning('While removing records of VIF attachments from node '
'%(node)s, we recieved indication that %(vif)s is '
'no longer attached. There should not happen under '
'%(node)s, we received indication that VIF %(vif)s is '
'no longer attached. This should not happen under '
'normal circumstances.',
{'node': task.node.uuid,
'vif': vif})
except exception.NetworkError as e:
LOG.error('An error has been encountered while removing a '
'VIF record for %(node)s. Error: %(error)s',
LOG.error('For node %(node)s, an error occurred while removing a '
'VIF record for VIF %(vif)s. Error: %(error)s',
{'node': task.node.uuid,
'vif': vif,
'error': e})

2
releasenotes/notes/remove-vifs-on-teardown-707c8e40c46b6e64.yaml
View File

@ -6,7 +6,7 @@ upgrade:
If your use of the BareMetal service is reliant upon the behavior of
the VIFs being retained, which was introduced as a behavior change
during the Ocata cycle, then you must update your tooling to explicitly
re-add the the VIF attachments prior to deployment.
re-add the VIF attachments prior to deployment.
fixes:
- |
Removes all records of VIF attachments upon the teardown of a deployed