From: Steven Hardy <shardy@redhat.com>
Date: Mon, 10 Jun 2013 12:34:57 +0000 (+0100)
Subject: engine : remove GreenletExit workaround
X-Git-Tag: 2014.1~502
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=56d5fb9f83b647d27a00d56cb4dad8aad9e1169f;p=openstack-build%2Fheat-build.git

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
---

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)