Remove instance in ERROR state after failed create

If a VM was created but resulted in a nova error, the VM would enter
an error state and not be deleteable via heat delete.  Instead
the VM would persist after the delete operation.

Change-Id: I9135aefdf08aba9551f9290bd072906372583ed1
Fixes: bug #1099634

diff --git a/heat/engine/resources/instance.py b/heat/engine/resources/instance.py
index 15e17d5f158a0618460c0ea1670da136a2b3375f..4ee54bb5139b2dc8d25605c47ced87479a7f652a 100644 (file)
--- a/heat/engine/resources/instance.py
+++ b/heat/engine/resources/instance.py
@@ -270,6 +270,7 @@ class Instance(resource.Resource):
             self.resource_id_set(server.id)
             self._set_ipaddress(server.networks)
         else:
+            self.resource_id_set(server.id)
             raise exception.Error('%s instance[%s] status[%s]' %
                                   ('nova reported unexpected',
                                    self.name, server.status))