commit 0c9f98f64fdd845c1a26348418164e55a37042d0
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): Conflict as I8da38aec0fe4808273b8587ace3df9dbbc3ab576 is
not present in stable/rocky.
Conflicts: nova/compute/manager.py
NOTE(lyarwood): Conflict as Ib61913d9d6ef6148170963463bb71c13f4272c5d is
not present in stable/stein.
Conflicts: nova/compute/manager.py
Co-Authored-By: Lee Yarwood <email address hidden>
Closes-Bug: #1780973
Change-Id: Ic4bbc075127823abfc559693a0db79e5e23f8209
(cherry picked from commit 1c480a75edc0f5f1b446121491869c02f30437a0)
(cherry picked from commit 4ff46ff7677530bce3ef268b6a0d85b50308d2fd)
Reviewed: https:/ /review. opendev. org/660375 /git.openstack. org/cgit/ openstack/ nova/commit/ ?id=0c9f98f64fd d845c1a26348418 164e55a37042d0
Committed: https:/
Submitter: Zuul
Branch: stable/rocky
commit 0c9f98f64fdd845 c1a26348418164e 55a37042d0
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): 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)
Closes-Bug: #1780973
Change-Id: Ic4bbc075127823
(cherry picked from commit 1c480a75edc0f5f
(cherry picked from commit 4ff46ff7677530b