diff options
| author | Zuul <zuul@review.opendev.org> | 2020-03-11 15:29:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-03-11 15:29:11 +0000 |
| commit | 080a0fd99a959bfa1532f5469241fb1b995c7a7b (patch) | |
| tree | b3c0c115057890aefc7fefec3857babea8c23c6c /ironic | |
| parent | d2a703311729d03dc8d667f4b838201dda042a81 (diff) | |
| parent | 5cb69916ce63ce0c6c00f60e82ce1212ea6cb4ce (diff) | |
| download | ironic-080a0fd99a959bfa1532f5469241fb1b995c7a7b.tar.gz | |
Merge "Follow up to console port allocation"
Diffstat (limited to 'ironic')
| -rw-r--r-- | ironic/drivers/modules/ipmitool.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ironic/drivers/modules/ipmitool.py b/ironic/drivers/modules/ipmitool.py index 666e48b45..44779f1ca 100644 --- a/ironic/drivers/modules/ipmitool.py +++ b/ironic/drivers/modules/ipmitool.py @@ -843,9 +843,8 @@ def _allocate_port(task): def _release_allocated_port(task): node = task.node dii = node.driver_internal_info or {} - allocated_port = dii.get('allocated_ipmi_terminal_port') + allocated_port = dii.pop('allocated_ipmi_terminal_port', None) if allocated_port: - dii.pop('allocated_ipmi_terminal_port') node.driver_internal_info = dii node.save() console_utils.release_port(allocated_port) |