VMware: snapshoting a VM with ephemeral disk attached creates wrong image

[Gary Kotton]

Booting a image that was snapshoted from a VM with an ephemarl disk fails. This is due to the fact that the wrong root disk is uploaded!

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

commit a55300fb43dd1987e1aca5a8de815b32b0b05677
Author: Gary Kotton <email address hidden>
Date: Thu Jan 8 02:47:31 2015 -0800

    VMware: ensure that correct disk details are returned

    When querying the root disk and a ephemeral disk is attached
    we need to ensure that the correct disk details are returned.
    Prior to the ephemeral disk support, the root disk was the only
    disk in the directory.
    We need to make sure that the disk is the root disk.

    This breaks snapshots of images and resizing.

    Either the root disk details will be returned, if requested, or the
    last disk that is found.

    Change-Id: I6d9f0c920409c5f6f53f552390fcd0d07ebf7d0b
    Closes-bug: #1408613