Merge "Fix action plan state change when action failed"

2017-10-10 12:06:07 +00:00
parent f3b3e82313 5814914aef
commit 6208caba0c
4 changed files with 15 additions and 5 deletions
--- a/watcher/applier/workflow_engine/default.py
+++ b/watcher/applier/workflow_engine/default.py
@@ -127,8 +127,10 @@ class TaskFlowActionContainer(base.BaseTaskFlowActionContainer):
            return self.engine.notify(self._db_action,
                                      objects.action.State.SUCCEEDED)
        else:
-            return self.engine.notify(self._db_action,
-                                      objects.action.State.FAILED)
+            self.engine.notify(self._db_action,
+                               objects.action.State.FAILED)
+            raise exception.ActionExecutionFailure(
+                action_id=self._db_action.uuid)

    def do_post_execute(self):
        LOG.debug("Post-condition action: %s", self.name)