Merge pull request #978 from GowthamShanmugam/unmanage_fail_fix

unmanaged task always fails after import failure
Tendrl · May 29, 2018 · 153c6e9 · 153c6e9
2 parents c39c399 + da0f882
commit 153c6e9
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/tendrl/commons/objects/cluster/atoms/import_cluster/__init__.py b/tendrl/commons/objects/cluster/atoms/import_cluster/__init__.py
@@ -186,15 +186,15 @@ def run(self):
                         )
                         return False
                     time.sleep(10)
-                    finished = True
+                    completed = True
                     for child_job_id in parent_job.children:
                         child_job = NS.tendrl.objects.Job(
                             job_id=child_job_id
                         ).load()
-                        if child_job.status != "finished":
-                            finished = False
+                        if child_job.status not in ["finished", "failed"]:
+                            completed = False
                             break
-                    if finished:
+                    if completed:
                         break
                     else:
                         loop_count += 1