Merge "Get cancellation grace period correctly"

heat/engine/resource.py

@@ -1151,9 +1151,6 @@ class Resource(status.ResourceStatus):
         properties.update_translation(rules, client_resolve=client_resolve)
 
     def cancel_grace_period(self):
-        if self.status != self.IN_PROGRESS:
-            return None
-
         canceller = getattr(self,
                             'handle_%s_cancel' % self.action.lower(),
                             None)

heat/engine/scheduler.py

@@ -472,7 +472,10 @@ class DependencyTaskGroup(object):
                 return grace_period
 
         for k, r in six.iteritems(self._runners):
-            gp = get_grace_period(k)
+            if not r.started() or r.done():
+                gp = None
+            else:
+                gp = get_grace_period(k)
             try:
                 r.cancel(grace_period=gp)
             except Exception as ex: