From 56d5fb9f83b647d27a00d56cb4dad8aad9e1169f Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Mon, 10 Jun 2013 13:34:57 +0100 Subject: [PATCH] engine : remove GreenletExit workaround Both heat and oslo now require the version of greenlet containing the fix (greenlet>=0.3.2) so we no longer need this workaround Change-Id: I42af8e020f08480dda08f4b4879c2840e741ea59 --- heat/engine/resource.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/heat/engine/resource.py b/heat/engine/resource.py index 40eb7004..63b180f1 100644 --- a/heat/engine/resource.py +++ b/heat/engine/resource.py @@ -15,7 +15,6 @@ import base64 from datetime import datetime -from eventlet.support import greenlets as greenlet from heat.engine import event from heat.common import exception @@ -337,14 +336,6 @@ class Resource(object): yield while not self.check_create_complete(create_data): yield - except greenlet.GreenletExit: - # Older versions of greenlet erroneously had GreenletExit inherit - # from Exception instead of BaseException - with excutils.save_and_reraise_exception(): - try: - self.state_set(self.CREATE_FAILED, 'Creation aborted') - except Exception: - logger.exception('Error marking resource as failed') except Exception as ex: logger.exception('create %s', str(self)) failure = exception.ResourceFailure(ex) -- 2.45.2