shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-16 22:50:10 +03:00
Code Releases Wiki Activity

F #4302: Fix for several broken vcenter actions

Browse Source
This commit is contained in:
Tino Vazquez 2020-05-11 15:00:16 +02:00
parent f9fd4ebf7d
commit 03fef86d3c
No known key found for this signature in database
GPG Key ID: 2FE9C32E94AEABBE
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mad/ruby/OpenNebulaDriver.rb
View File

@ -97,7 +97,7 @@ class OpenNebulaDriver < ActionManager
command = action_command_line(aname, params, options[:script_name])
if action_is_local?(aname)
stdin = Base64.strict_encode64(options[:stdin])
stdin = Base64.strict_encode64(options[:stdin].to_s)
execution = LocalCommand.run(command,
log_method(id),
stdin,

17
src/vmm_mad/exec/one_vmm_exec.rb
View File

@ -618,7 +618,7 @@ class ExecDriver < VirtualMachineDriver
deploy_id = data.elements['DEPLOY_ID'].text
do_action("#{deploy_id} #{host}", id, host, ACTION[:poll],
:stdin => xml_data)
:stdin => xml_data.to_s)
end
# REBOOT action, reboots a running VM
@ -737,7 +737,7 @@ class ExecDriver < VirtualMachineDriver
host,
ACTION[:snapshot_create],
:script_name => 'snapshot_create',
:stdin => xml_data)
:stdin => xml_data.to_s)
end
#
@ -757,7 +757,7 @@ class ExecDriver < VirtualMachineDriver
host,
ACTION[:snapshot_revert],
:script_name => 'snapshot_revert',
:stdin => xml_data)
:stdin => xml_data.to_s)
end
#
@ -777,7 +777,7 @@ class ExecDriver < VirtualMachineDriver
host,
ACTION[:snapshot_delete],
:script_name => 'snapshot_delete',
:stdin => xml_data)
:stdin => xml_data.to_s)
end
#
@ -1005,8 +1005,7 @@ class ExecDriver < VirtualMachineDriver
steps << {
:driver => :vmm,
:action => :reconfigure,
:parameters => [:deploy_id, target_device, target_path],
:stdin => xml_data
:parameters => [:deploy_id, target_device, target_path]
}
action.run(steps)
@ -1094,8 +1093,7 @@ class ExecDriver < VirtualMachineDriver
steps << {
:driver => :vmm,
:action => :reconfigure,
:parameters => [:deploy_id, target_device, target_path],
:stdin => xml_data
:parameters => [:deploy_id, target_device, target_path]
}
action.run(steps)
@ -1176,8 +1174,7 @@ class ExecDriver < VirtualMachineDriver
steps << {
:driver => :vmm,
:action => :reconfigure,
:parameters => [:deploy_id, target_device, target_path],
:stdin => xml_data
:parameters => [:deploy_id, target_device, target_path]
}
action.run(steps)