Reviewed: https://review.openstack.org/548526 Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=06946b7f8ad310e01eff895362ad0f3a164636f5 Submitter: Zuul Branch: stable/pike
commit 06946b7f8ad310e01eff895362ad0f3a164636f5 Author: Shoham Peller <email address hidden> Date: Tue Sep 27 20:25:05 2016 +0300
Handle spawning error on unshelving
If spawning fails when unshelving, terminate the volumes' connections with the node, and remove the node reference from the instance entry.
Co-Authored-By: Matt Riedemann <email address hidden>
Conflicts: nova/compute/manager.py
NOTE(mriedem): Conflicts are due to the following changes not in Pike:
I391554d3904a5a60b921ef4714a1cfd0a64a25c2
If38e4a6d49910f0aa5016e1bcb61aac2be416fa7
I00eab47edf1150788777300680e853a872c1db40
Closes-Bug: 1627694 Change-Id: I8cfb2280d956d452ccad1fc711bd814b7258147f (cherry picked from commit dcdd2c9832c7c60fe9163cd744ca2b5acfe16bcc) (cherry picked from commit 73c3e4969c108f2eefc77b57021d9b3e17afdc8e)
Reviewed: https:/ /review. openstack. org/548526 /git.openstack. org/cgit/ openstack/ nova/commit/ ?id=06946b7f8ad 310e01eff895362 ad0f3a164636f5
Committed: https:/
Submitter: Zuul
Branch: stable/pike
commit 06946b7f8ad310e 01eff895362ad0f 3a164636f5
Author: Shoham Peller <email address hidden>
Date: Tue Sep 27 20:25:05 2016 +0300
Handle spawning error on unshelving
If spawning fails when unshelving, terminate the volumes' connections
with the node, and remove the node reference from the instance entry.
Co-Authored-By: Matt Riedemann <email address hidden>
Conflicts:
nova/ compute/ manager. py
NOTE(mriedem): Conflicts are due to the following changes not in Pike:
I391554d3 904a5a60b921ef4 714a1cfd0a64a25 c2
If38e4a6d 49910f0aa5016e1 bcb61aac2be416f a7
I00eab47e df1150788777300 680e853a872c1db 40
Closes-Bug: 1627694 52ccad1fc711bd8 14b7258147f fe9163cd744ca2b 5acfe16bcc) eefc77b57021d9b 3e17afdc8e)
Change-Id: I8cfb2280d956d4
(cherry picked from commit dcdd2c9832c7c60
(cherry picked from commit 73c3e4969c108f2