Comment 9 for bug 1780973

Revision history for this message
OpenStack Infra (hudson-openstack) wrote : Fix merged to nova (stable/queens)

Reviewed: https://review.opendev.org/662471
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=95a3e0cf6aee8f278a1441f3e50517f08c6f3038
Submitter: Zuul
Branch: stable/queens

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.

    Conflicts:
        nova/compute/manager.py
        nova/tests/unit/compute/test_compute_mgr.py

    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)
    (cherry picked from commit 0c9f98f64fdd845c1a26348418164e55a37042d0)