Comment 26 for bug 1269418

Reviewed: https://review.openstack.org/89768
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=b3cc3f62a60662e5bb82136c0cfa464592a6afe9
Submitter: Jenkins
Branch: stable/havana

commit b3cc3f62a60662e5bb82136c0cfa464592a6afe9
Author: Gary Kotton <email address hidden>
Date: Thu Mar 13 06:53:58 2014 -0700

    VMware: ensure rescue instance is deleted when instance is deleted

    If the user creates a rescue instance and then proceeded to delete
    the original instance then the rescue instance would still be up
    and running on the backend.

    This patch ensures that the rescue instance is cleaned up if
    necessary.

    The vmops unrescue method has a new parameter indicating if
    the original VM should be powered on.

    Closes-bug: 1269418
    (cherry picked from commit efb66531bc37ee416778a70d46c657608ca767af)

    Conflicts:

     nova/tests/virt/vmwareapi/test_vmwareapi.py
     nova/virt/vmwareapi/vmops.py

    Change-Id: I3c1d0b1d003392b306094b80ea1ac99377441fbf