Comment 4 for bug 1404801

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

commit 2dec248dc767ed0a9e064c3a61429387b5740bac
Author: PranaliDeore <email address hidden>
Date: Tue Dec 23 06:04:24 2014 -0800

    Unshelving a volume backed instance doesn't work

    In case of volume backed instance, snapshot is not
    taken when an instance is shelved, so shelve_image_id
    key is not set to the instance system metadata.
    If shelve_image_id is None, then it shouldn't raise UnshelveException.

    Note: The required unit-tests are manually added to the below path,
    as new path for unit-tests is not present in stable/juno release.
    nova/tests/conductor/test_conductor.py

    Conflicts:
            nova/conductor/manager.py
            nova/tests/unit/conductor/test_conductor.py

    Closes-Bug: #1404801
    Change-Id: I295e3e2b2c2d640684a5416c53fa1fed7e6297e2
    (cherry picked from commit c944babe99657093cc8210478deaae0142c98e96)