Merge branch 'master' into bugfix/log_vm_terminate_errors

This commit is contained in:
PCoder 2018-09-07 22:43:29 +02:00
commit 8e7789462e
24 changed files with 284 additions and 68 deletions

View file

@ -315,7 +315,7 @@ class OpenNebulaManager():
return vm_id
def delete_vm(self, vm_id):
TERMINATE_ACTION = 'terminate'
TERMINATE_ACTION = 'terminate-hard'
vm_terminated = False
try:
self.oneadmin_client.call(