rbd resize revert fails

[Jon Bernard]

In Ceph CI, the revert-resize server test is failing. It appears that revert_resize() does not take shared storage into account and deletes the orignal volume, which causes the start of the original instance to fail.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/139693

[Jeffrey Zhang (jeffrey4l)]

Is this bug a duplication for https://bugs.launchpad.net/nova/+bug/1314526 ?

[Jon Bernard (jbernard)]

No, it's related but not exactly the same. The fix proposed there address live migration only, not cold migrations or resizes. This patch should take care of that case.

[Dmitry Borodaenko (angdraug)]

In fact, bug #1314526 was reopened exactly because my live migration patch was not enough to fix this.

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/139693
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=eec0937af9d88f3c7ffacf9ce7b8955b2e4be479
Submitter: Jenkins
Branch: master

commit eec0937af9d88f3c7ffacf9ce7b8955b2e4be479
Author: Jon Bernard <email address hidden>
Date: Fri Dec 5 11:58:12 2014 -0500

    Honor shared storage on resize revert

    This patch improves the logic in resize_revert() to properly honor
    shared storage when destroying the unneeded instance. In the case of
    shared storage, the disks need not be destroyed and doing so results in
    the inability to start the original instance.

    Change-Id: I310f6b62a790e4549a2cf9ff3842655da552177a
    Closes-Bug: #1399244

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/juno
Review: https://review.openstack.org/149371

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/149371
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=b6692dd9f619de932ea9fc356da41ee1b471114c
Submitter: Jenkins
Branch: stable/juno

commit b6692dd9f619de932ea9fc356da41ee1b471114c
Author: Jon Bernard <email address hidden>
Date: Fri Dec 5 11:58:12 2014 -0500

    Honor shared storage on resize revert

    This patch improves the logic in resize_revert() to properly honor
    shared storage when destroying the unneeded instance. In the case of
    shared storage, the disks need not be destroyed and doing so results in
    the inability to start the original instance.

    Conflicts is caused by moving tests to /unit directory

    Also commit contains squash from fixed implementation of determening
    if storage is shared (get from commit fde77d49ff550b73f5f1671edc7366c9b7646200)

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

    Closes-Bug: #1399244
    Change-Id: I310f6b62a790e4549a2cf9ff3842655da552177a
    (cherry picked from commit eec0937af9d88f3c7ffacf9ce7b8955b2e4be479)