From bc98a3fa0237193e4854a4315bc349c3f9db3f1f Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Sat, 23 Nov 2013 17:45:45 +0100
Subject: [PATCH] bug #2487: Always use the current system ds when resuming

---
 src/rm/RequestManagerVirtualMachine.cc | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/rm/RequestManagerVirtualMachine.cc b/src/rm/RequestManagerVirtualMachine.cc
index abcca47176..9af3de0300 100644
--- a/src/rm/RequestManagerVirtualMachine.cc
+++ b/src/rm/RequestManagerVirtualMachine.cc
@@ -686,25 +686,7 @@ void VirtualMachineDeploy::request_execute(xmlrpc_c::paramList const& paramList,
          vm->get_action() == History::UNDEPLOY_ACTION ||
          vm->get_action() == History::UNDEPLOY_HARD_ACTION))
     {
-        int c_ds_id = vm->get_ds_id();
-
-        if (ds_id == -1)
-        {
-            ds_id = c_ds_id;
-        }
-        else if (ds_id != c_ds_id)
-        {
-            ostringstream oss;
-
-            oss << "VM can only be resumed in System Datastore "
-                << "[" << c_ds_id << "]";
-
-            failure_response(ACTION, request_error(oss.str(),""), att);
-
-            vm->unlock();
-
-            return;
-        }
+        ds_id = vm->get_ds_id();
     }
 
     vm->unlock();