Comment 1 for bug 872917

+++ b/nova/api/ec2/cloud.py
@@ -285,7 +285,7 @@ class CloudController(object):
This seems to fix it although I'm not entirely sure some of the networking code changes aren't to blame as well (related to fixed_ips not getting unset or something).

     def _get_mpi_data(self, context, project_id):
         result = {}
- search_opts = {'project_id': project_id}
+ search_opts = {'project_id': project_id, 'deleted': False}
         for instance in self.compute_api.get_all(context,
                 search_opts=search_opts):
             # only look at ipv4 addresses
@@ -360,7 +360,7 @@ class CloudController(object):

     def get_metadata(self, address):
         ctxt = context.get_admin_context()
- search_opts = {'fixed_ip': address}
+ search_opts = {'fixed_ip': address, 'deleted': False}