InvalidCPUInfo exception not catched in conductor _live_migrate

[Facundo Maldonado]

Environment:
- fresh devstack multinode installation using nova-network.
- one controller node with a compute node (node_1)
- one compute node (node_2)

Both compute nodes has different cpu info features.

When live migrating from node_1 to node_2 an InvalidCPUInfo is raised in live_mirgate method in conductor's manager.
The exception is not captured and the roll back of the task_state is not performed.
The instance stays in 'migrating' state.

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

commit 7a3b4033f07f8c2144a36c1f12b1b9281cfb9a69
Author: Facundo Maldonado <email address hidden>
Date: Wed Mar 19 10:36:46 2014 -0300

    InvalidCPUInfo exception added to except block

    When a live migration between two nodes with different
    CPU info features is launched, an InvalidCPUInfo exception
    is raised and not captured. That lets the vm in an
    unusable state because the task_state rollback is not
    executed.

    Change-Id: Ib418fa324964cabd5f342d1b764f9ac7608b7ade
    Closes-Bug: #1294210

[Openstack Gerrit (openstack-gerrit)]

Fix proposed to branch: stable/icehouse
Review: https://review.openstack.org/89660

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/89660
Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=a48d2682aea3a39e16e638bb8475182c1e31e713
Submitter: Jenkins
Branch: stable/icehouse

commit a48d2682aea3a39e16e638bb8475182c1e31e713
Author: Facundo Maldonado <email address hidden>
Date: Wed Mar 19 10:36:46 2014 -0300

    InvalidCPUInfo exception added to except block

    When a live migration between two nodes with different
    CPU info features is launched, an InvalidCPUInfo exception
    is raised and not captured. That lets the vm in an
    unusable state because the task_state rollback is not
    executed.

    Change-Id: Ib418fa324964cabd5f342d1b764f9ac7608b7ade
    Closes-Bug: #1294210
    (cherry picked from commit 7a3b4033f07f8c2144a36c1f12b1b9281cfb9a69)