commit 95a3e0cf6aee8f278a1441f3e50517f08c6f3038
Author: Matthew Booth <email address hidden>
Date: Fri Mar 9 18:10:27 2018 +0000
Restore connection_info after live migration rollback
Building on I0390c9ff51f49b063f736ca6ef868a4fa782ede5 we can now restore
the original connection_info for a volume bdm when rolling back after a
live migration failure.
NOTE(lyarwood): Conflicts as I3689dd6544c387676983be47cf925c3fd7ce72f1
and Ia9ea1e164fb3b4a386405538eed58d94ad115172 are not present in
stable/queens.
Reviewed: https:/ /review. opendev. org/662471 /git.openstack. org/cgit/ openstack/ nova/commit/ ?id=95a3e0cf6ae e8f278a1441f3e5 0517f08c6f3038
Committed: https:/
Submitter: Zuul
Branch: stable/queens
commit 95a3e0cf6aee8f2 78a1441f3e50517 f08c6f3038
Author: Matthew Booth <email address hidden>
Date: Fri Mar 9 18:10:27 2018 +0000
Restore connection_info after live migration rollback
Building on I0390c9ff51f49b 063f736ca6ef868 a4fa782ede5 we can now restore
the original connection_info for a volume bdm when rolling back after a
live migration failure.
NOTE(lyarwood): Conflicts as I3689dd6544c387 676983be47cf925 c3fd7ce72f1 a386405538eed58 d94ad115172 are not present in
and Ia9ea1e164fb3b4
stable/queens.
Conflicts:
nova/compute/ manager. py
nova/tests/ unit/compute/ test_compute_ mgr.py
NOTE(lyarwood): Conflict as I8da38aec0fe480 8273b8587ace3df 9dbbc3ab576 is
not present in stable/rocky.
Conflicts:
nova/compute/ manager. py
NOTE(lyarwood): Conflict as Ib61913d9d6ef61 48170963463bb71 c13f4272c5d is
not present in stable/stein.
Conflicts:
nova/compute/ manager. py
Co-Authored-By: Lee Yarwood <email address hidden> abfc559693a0db7 9e5e23f8209 1b446121491869c 02f30437a0) ce3ef268b6a0d85 b50308d2fd) c1a26348418164e 55a37042d0)
Closes-Bug: #1780973
Change-Id: Ic4bbc075127823
(cherry picked from commit 1c480a75edc0f5f
(cherry picked from commit 4ff46ff7677530b
(cherry picked from commit 0c9f98f64fdd845