Merge pull request #348 from izapolsk/kill_broken_vm_anyway

[RFR] remove broken vms in openshift
RedHatQE · Dec 13, 2018 · d21c09a · d21c09a
2 parents f555070 + f590a4a
commit d21c09a
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/wrapanapi/systems/container/rhopenshift.py b/wrapanapi/systems/container/rhopenshift.py
@@ -496,8 +496,12 @@ def delete_vm(self, vm_name):
         # openshift 3.6 has an issue. if pvc/pv are removed earlier than pods,
         # pods get hung and cannot be removed.
         # so, we need to stop all pods in project before removal
-        self.stop_vm(vm_name)
-        self.wait_vm_stopped(vm_name)
+        try:
+            self.stop_vm(vm_name)
+            self.wait_vm_stopped(vm_name, num_sec=60)
+        except BaseException as e:
+            self.logger.exception("vm %s couldn't be stopped because of '%s'. calling remove vm",
+                                  vm_name, e.message)
         self.delete_project(name=vm_name)
         return True