From b615fc9bada36e04473564ec0af1c088906f94b9 Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Thu, 22 Aug 2013 13:32:01 +1200 Subject: [PATCH] Do not delete nova server on create fail To keep in line with the behaviour of other resources, a nova server should only be deleted on resource delete. Fixes bug: #1215132 Change-Id: Ic478754b7b96001fa0d4110a66d008609de7b482 --- heat/engine/resources/instance.py | 3 --- heat/tests/test_instance.py | 5 ----- 2 files changed, 8 deletions(-) diff --git a/heat/engine/resources/instance.py b/heat/engine/resources/instance.py index e00bc36a..dbb66d13 100644 --- a/heat/engine/resources/instance.py +++ b/heat/engine/resources/instance.py @@ -311,9 +311,6 @@ class Instance(resource.Resource): fault = getattr(server, 'fault', {}) message = fault.get('message', 'Unknown') code = fault.get('code', 500) - delete = scheduler.TaskRunner( - nova_utils.delete_server, server) - delete(wait_time=0.2) exc = exception.Error(_("Build of server %(server)s failed: " "%(message)s (%(code)s)") % dict(server=server.name, diff --git a/heat/tests/test_instance.py b/heat/tests/test_instance.py index 431cd6cf..91c075a2 100644 --- a/heat/tests/test_instance.py +++ b/heat/tests/test_instance.py @@ -16,7 +16,6 @@ import copy import mox -from heat.engine import clients from heat.engine import environment from heat.tests.v1_1 import fakes from heat.common import exception @@ -232,8 +231,6 @@ class InstancesTest(HeatTestCase): } self.m.StubOutWithMock(return_server, 'get') return_server.get() - return_server.get().AndRaise( - clients.novaclient.exceptions.NotFound('test')) self.m.ReplayAll() self.assertRaises(exception.Error, @@ -250,8 +247,6 @@ class InstancesTest(HeatTestCase): self.m.StubOutWithMock(return_server, 'get') return_server.get() - return_server.get().AndRaise( - clients.novaclient.exceptions.NotFound('test')) self.m.ReplayAll() try: -- 2.45.2