diff options
| author | Zuul <zuul@review.openstack.org> | 2018-05-12 00:22:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-05-12 00:22:32 +0000 |
| commit | a334f66a4f33f96b1f174a1bec83fc1d5806bb01 (patch) | |
| tree | 6539e13aacb5f75dfea17458e4c3fdf03684dd8f | |
| parent | 356d62d146258869e3a53731b73f3a8e06df520a (diff) | |
| parent | f78aba3518f52f40a802e9eb145b18c3edba480d (diff) | |
| download | ironic-a334f66a4f33f96b1f174a1bec83fc1d5806bb01.tar.gz | |
Merge "Update wording used in removal of VIFs" into stable/queens
| -rw-r--r-- | ironic/common/network.py | 16 | ||||
| -rw-r--r-- | releasenotes/notes/remove-vifs-on-teardown-707c8e40c46b6e64.yaml | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/ironic/common/network.py b/ironic/common/network.py index 05906ee43..00735e7db 100644 --- a/ironic/common/network.py +++ b/ironic/common/network.py @@ -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}) diff --git a/releasenotes/notes/remove-vifs-on-teardown-707c8e40c46b6e64.yaml b/releasenotes/notes/remove-vifs-on-teardown-707c8e40c46b6e64.yaml index e0e7cb821..ae3d03e4c 100644 --- a/releasenotes/notes/remove-vifs-on-teardown-707c8e40c46b6e64.yaml +++ b/releasenotes/notes/remove-vifs-on-teardown-707c8e40c46b6e64.yaml @@ -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 |