Changed Unmanage flow - incorporated review changes

tendrl-bug-id: #841 bugzilla: 1583590 Signed-off-by: Anmol Sachan <anmol13694@gmail.com>
Tendrl · May 31, 2018 · 22786c4 · 22786c4
1 parent 280cef2
commit 22786c4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tendrl/commons/flows/unmanage_cluster/__init__.py b/tendrl/commons/flows/unmanage_cluster/__init__.py
@@ -111,7 +111,7 @@ def run(self):
                     time.sleep(5)
                     finished = True
                     job = NS.tendrl.objects.Job(job_id=_job_id).load()
-                    if job.status != "finished":
+                    if job.status not in ['finished', 'failed']:
                         finished = False
                     if finished:
                         break

diff --git a/tendrl/commons/objects/cluster/atoms/unmanage_cluster/__init__.py b/tendrl/commons/objects/cluster/atoms/unmanage_cluster/__init__.py
@@ -112,7 +112,7 @@ def run(self):
                         child_job = NS.tendrl.objects.Job(
                             job_id=child_job_id
                         ).load()
-                        if child_job.status != "finished":
+                        if child_job.status not in ['finished', 'failed']:
                             finished = False
                             break
                     if finished: