Unshelving an instance with an attached volume causes the volume to not get attached

[Nikola Đipanov]

When shelving an instance that has a volume attached - once it's unshelved, the volume will not get re-attached.

Reproduce by:

$nova boot --image <IMAGE> --flavor <FLAVOR> test
$nova attach <INSTANCE> <VOLUME> #ssh into the instance and make sure the volume is there
$nova shelve <INSTANCE> #Make sure the instance is done shelving
$nova unshelve <INSTANCE> #Log in and see that the volume is not visible any more

It can also be seen that the volume remains attached as per

$sinder list

And if you take a look at the generated xml (if you use libvirt) you can see that the volume is not there when the instance is done unshelving.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/havana
Review: https://review.openstack.org/54604

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/54603
Committed: http://github.com/openstack/nova/commit/7fb9fcc970324236267d893185b421e26b1cb1d9
Submitter: Jenkins
Branch: master

commit 7fb9fcc970324236267d893185b421e26b1cb1d9
Author: Nikola Dipanov <email address hidden>
Date: Wed Oct 30 19:28:02 2013 +0100

    Make unshelve use new style BDM

    Unshelving an instance requires recreating it, and since change
    I5b9c3e2d959c602fa22f49db681da918ae0adcea, it is necessary to call
    compute manager's _prep_block_device with new style BDMs.

    This patch makes the conductor return new-style BDMs when unshelving the
    instance.

    Closes-bug: 1246412
    blueprint: clean-up-legacy-block-device-mapping

    Change-Id: I0ba9f53c31c4d5238319cfd09600ad64f298629e

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/54604
Committed: http://github.com/openstack/nova/commit/0dc575d1744eff2f9f8fb4a89a0265433ee6e4ba
Submitter: Jenkins
Branch: stable/havana

commit 0dc575d1744eff2f9f8fb4a89a0265433ee6e4ba
Author: Nikola Dipanov <email address hidden>
Date: Wed Oct 30 19:28:02 2013 +0100

    Make unshelve use new style BDM

    Unshelving an instance requires recreating it, and since change
    I5b9c3e2d959c602fa22f49db681da918ae0adcea, it is necessary to call
    compute manager's _prep_block_device with new style BDMs.

    This patch makes the conductor return new-style BDMs when unshelving the
    instance.

    Closes-bug: 1246412
    blueprint: clean-up-legacy-block-device-mapping

    Change-Id: I0ba9f53c31c4d5238319cfd09600ad64f298629e
    (cherry picked from commit 7fb9fcc970324236267d893185b421e26b1cb1d9)