From 9df414974746a2efa8c244d996d02b56c114ead5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Mon, 22 Jul 2013 17:14:10 +0200
Subject: [PATCH] Feature #2084: Use vm shutdown --hard instead of vm delete
 for oneflow delete (cherry picked from commit
 3b3f8f6eb2967175faf961dba50608d315595129)

---
 src/flow/lib/models/role.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/flow/lib/models/role.rb b/src/flow/lib/models/role.rb
index 20786127bd..84a65223a3 100644
--- a/src/flow/lib/models/role.rb
+++ b/src/flow/lib/models/role.rb
@@ -319,7 +319,11 @@ module OpenNebula
                 Log.debug LOG_COMP, "Role #{name} : Deleting VM #{vm_id}", @service.id()
 
                 vm = OpenNebula::VirtualMachine.new_with_id(vm_id, @service.client)
-                rc = vm.finalize
+                rc = vm.shutdown(true)
+
+                if OpenNebula.is_error?(rc)
+                    rc = vm.finalize
+                end
 
                 if OpenNebula.is_error?(rc)
                     msg = "Role #{name} : Delete failed for VM #{vm_id}; #{rc.message}"