Merge branch 'master' of git.opennebula.org:one

src/vmm_mad/exec/one_vmm_exec.rb

@@ -159,7 +159,7 @@ class VmmAction
 
             # Roll back steps, store failed info and break steps
             if DriverExecHelper.failed?(result)
-                execute_steps(@data[:fail_actions]) if @data[:fail_actions]
+                execute_steps(step[:fail_actions]) if step[:fail_actions]
                 @data[:failed_info] = info
 
                 @vmm.log(@id,

src/vnm_mad/remotes/OpenNebulaNetwork.rb

@@ -118,9 +118,8 @@ class OpenNebulaNetwork
     def detect_hypervisor
         lsmod       = `#{COMMANDS[:lsmod]}`
         xen_file    = "/proc/xen/capabilities"
-        xen_content = "control_d"
 
-        if File.readable?(xen_file) and File.read(xen_file).strip == xen_content
+        if File.exists?(xen_file)
             "xen"
         elsif lsmod.match(/kvm/)
             "kvm"