From 5f63b5dd2686e6909e6cf63c649d0aecac1c4d61 Mon Sep 17 00:00:00 2001
From: Javi Fontan <jfontan@opennebula.org>
Date: Fri, 13 Nov 2015 15:38:08 +0100
Subject: [PATCH] bug #4048: take out TM ROLLBACK from snap create

(cherry picked from commit a35b4d483c1abb6e1c40aa8f1f72d407152be16b)
---
 src/vmm_mad/exec/one_vmm_exec.rb | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/vmm_mad/exec/one_vmm_exec.rb b/src/vmm_mad/exec/one_vmm_exec.rb
index 62a24b97a8..6d354beac1 100755
--- a/src/vmm_mad/exec/one_vmm_exec.rb
+++ b/src/vmm_mad/exec/one_vmm_exec.rb
@@ -906,7 +906,6 @@ class ExecDriver < VirtualMachineDriver
 
         # Get TM command
         tm_command = ensure_xpath(xml_data, id, action, 'TM_COMMAND') || return
-        tm_rollback= xml_data.elements['TM_COMMAND_ROLLBACK'].text.strip
 
         # Build the process
         case strategy
@@ -944,14 +943,7 @@ class ExecDriver < VirtualMachineDriver
                     :driver     => :vmm,
                     :action     => :attach_disk,
                     :parameters => [:deploy_id, :disk_target_path, target,
-                                    target_index, drv_message],
-                    :fail_actions => [
-                        {
-                            :driver     => :tm,
-                            :action     => :tm_snap_delete,
-                            :parameters => tm_rollback.split
-                        }
-                    ]
+                                    target_index, drv_message]
                 }
             ]
         when :suspend
@@ -983,14 +975,7 @@ class ExecDriver < VirtualMachineDriver
                 {
                     :driver     => :vmm,
                     :action     => :restore,
-                    :parameters => [:checkpoint_file, :host, :deploy_id],
-                    :fail_actions => [
-                        {
-                            :driver     => :tm,
-                            :action     => :tm_snap_delete,
-                            :parameters => tm_rollback.split
-                        }
-                    ]
+                    :parameters => [:checkpoint_file, :host, :deploy_id]
                 },
                 # network drivers (post)
                 {