From: Steven Dake <sdake@redhat.com>
Date: Tue, 15 Jan 2013 20:38:21 +0000 (-0700)
Subject: Remove instance in ERROR state after failed create
X-Git-Tag: 2014.1~993^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=417b4c1c6310cab2e2ea5a014b969e4c095c1030;p=openstack-build%2Fheat-build.git

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 15e17d5f..4ee54bb5 100644
--- 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))