support_cluster_with_spaces.patch

diff --git a/src/im_mad/im_exec/one_im_exec.rb b/src/im_mad/im_exec/one_im_exec.rb
index 881192f..517f6a5 100755
--- a/src/im_mad/im_exec/one_im_exec.rb
+++ b/src/im_mad/im_exec/one_im_exec.rb
@@ -69,7 +69,8 @@ class InformationManagerDriver < OpenNebulaDriver
     end
 
     # Execute the run_probes in the remote host
-    def action_monitor(number, host, ds_location, do_update)
+    def action_monitor(number, host1, host2, ds_location, do_update)
+        host="#{host1} #{host2}"
 
         if !action_is_local?(:MONITOR)
             if do_update == "1" || @options[:force_copy]
diff --git a/src/mad/ruby/OpenNebulaDriver.rb b/src/mad/ruby/OpenNebulaDriver.rb
index 9b12aaa..bc89664 100644
--- a/src/mad/ruby/OpenNebulaDriver.rb
+++ b/src/mad/ruby/OpenNebulaDriver.rb
@@ -92,7 +92,7 @@ class OpenNebulaDriver < ActionManager
             :base64      => false
         }.merge(ops)
 
-        params  = parameters + " #{id} #{host}"
+        params  = parameters + " #{id} '#{host}'"
         command = action_command_line(aname, params, options[:script_name])
 
         if action_is_local?(aname)
diff --git a/src/vmm_mad/exec/one_vmm_exec.rb b/src/vmm_mad/exec/one_vmm_exec.rb
index 9e84bcf..41a19a8 100755
--- a/src/vmm_mad/exec/one_vmm_exec.rb
+++ b/src/vmm_mad/exec/one_vmm_exec.rb
@@ -611,7 +611,7 @@ class ExecDriver < VirtualMachineDriver
         host      = data.elements['HOST'].text
         deploy_id = data.elements['DEPLOY_ID'].text
 
-        do_action("#{deploy_id} #{host}", id, host, ACTION[:poll])
+        do_action("#{deploy_id} '#{host}'", id, host, ACTION[:poll])
     end
 
     #
@@ -622,7 +622,7 @@ class ExecDriver < VirtualMachineDriver
         host      = data.elements['HOST'].text
         deploy_id = data.elements['DEPLOY_ID'].text
 
-        do_action("#{deploy_id} #{host}", id, host, ACTION[:reboot])
+        do_action("#{deploy_id} '#{host}'", id, host, ACTION[:reboot])
     end
 
     #
@@ -633,7 +633,7 @@ class ExecDriver < VirtualMachineDriver
         host      = data.elements['HOST'].text
         deploy_id = data.elements['DEPLOY_ID'].text
 
-        do_action("#{deploy_id} #{host}", id, host, ACTION[:reset])
+        do_action("#{deploy_id} '#{host}'", id, host, ACTION[:reset])
     end
 
     #
diff --git a/src/vmm_mad/remotes/vcenter/reconfigure b/src/vmm_mad/remotes/vcenter/reconfigure
index bb8d1b4..451ded8 100755
--- a/src/vmm_mad/remotes/vcenter/reconfigure
+++ b/src/vmm_mad/remotes/vcenter/reconfigure
@@ -38,6 +38,7 @@ vm.info
 
 vm_xml = vm.to_xml
 
+
 begin
     VCenterDriver::VCenterVm.reconfigure(deploy_id, host, vm_xml)
 rescue Exception => e
diff --git a/src/vmm_mad/remotes/vcenter/restore b/src/vmm_mad/remotes/vcenter/restore
index 7c9d24b..a989b23 100755
--- a/src/vmm_mad/remotes/vcenter/restore
+++ b/src/vmm_mad/remotes/vcenter/restore
@@ -29,7 +29,7 @@ $: << File.dirname(__FILE__)
 
 require 'vcenter_driver'
 
-host            = ARGV[-1]
+host            = ARGV[1]
 deploy_id       = ARGV[2]
 
 begin
diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb
index d21d3d9..dee74a5 100644
--- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb
+++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb
@@ -654,7 +654,7 @@ class VIClient
                        :one  => "NAME=#{ds.name}\n"\
                                 "DS_MAD=vcenter\n"\
                                 "TM_MAD=vcenter\n"\
-                                "VCENTER_CLUSTER=#{cluster_name}\n"
+                                "VCENTER_CLUSTER=\"#{cluster_name}\"\n"
                      }
                  end
             }