diff options
| author | Julia Kreger <juliaashleykreger@gmail.com> | 2018-03-26 21:06:20 -0700 |
|---|---|---|
| committer | Jim Rollenhagen <jim@jimrollenhagen.com> | 2018-04-12 08:18:44 -0400 |
| commit | 3a4e259a3714cedcad567e229e983f1b559c2668 (patch) | |
| tree | 9cd7cba2f74379dc5f4949ab67281ea716df2f5b /ironic/conductor | |
| parent | 9143ec7bafa6c7e4007a35675467b6434c6f9b73 (diff) | |
| download | ironic-3a4e259a3714cedcad567e229e983f1b559c2668.tar.gz | |
Remove vifs upon teardown
Since we removed the ability for nova to cleanly remove
the vif during teardown because that created a race condition,
the removal of all vif attachment records only seems to be the
right thing to do since we can't realistically change nova try
harder, and functionally we are otherwise looking at massive
locking changes.
Removing vif records is the lesser evil until we can reach
consensus on completely revamping locking to allow for greater
concurrency.
Change-Id: I8d683d2d506c97535b5a8f9a5de4c070c7e887df
Story: #1743652
Task: #9275
Diffstat (limited to 'ironic/conductor')
| -rw-r--r-- | ironic/conductor/manager.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ironic/conductor/manager.py b/ironic/conductor/manager.py index 951f7c73e..c25933adf 100644 --- a/ironic/conductor/manager.py +++ b/ironic/conductor/manager.py @@ -62,6 +62,7 @@ from ironic.common import exception from ironic.common.glance_service import service_utils as glance_utils from ironic.common.i18n import _ from ironic.common import images +from ironic.common import network from ironic.common import states from ironic.common import swift from ironic.conductor import base_manager @@ -928,6 +929,7 @@ class ConductorManager(base_manager.BaseConductorManager): driver_internal_info = node.driver_internal_info driver_internal_info.pop('instance', None) node.driver_internal_info = driver_internal_info + network.remove_vifs_from_node(task) node.save() # Begin cleaning |