shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-23 17:33:56 +03:00
Code Releases Wiki Activity

Remove duplicated param on vcenter premigrator

Browse Source 
(cherry picked from commit 68f525fcb8)
This commit is contained in:
Tino Vazquez 2017-09-20 18:01:59 +02:00
parent 2079556657
commit 0996242f64
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/onedb/vcenter_one54_pre.rb
View File

@ -944,7 +944,7 @@ def vm_unmanaged_discover(devices, xml_doc, template_xml,
return extraconfig return extraconfig
end end
def template_unmanaged_discover(vi_client, devices, ccr_name, ccr_ref, def template_unmanaged_discover(devices, ccr_name, ccr_ref,
vcenter_name, vcenter_uuid, vcenter_name, vcenter_uuid,
vcenter_user, vcenter_pass, vcenter_host, vcenter_user, vcenter_pass, vcenter_host,
dc_name, dc_ref, ipool, vnpool, dspool, hpool, dc_name, dc_ref, ipool, vnpool, dspool, hpool,
@ -2404,8 +2404,7 @@ def inspect_templates(vc_templates, vc_clusters, one_clusters, tpool, ipool, vnp
dc_ref = dc._ref dc_ref = dc._ref
vcenter_name = vi_client.host vcenter_name = vi_client.host
STDOUT.puts "--- Discovering disks and network interfaces inside the template (please be patient)" STDOUT.puts "--- Discovering disks and network interfaces inside the template (please be patient)"
unmanaged = template_unmanaged_discover(vi_client, unmanaged = template_unmanaged_discover(vc_template["config.hardware.device"],
vc_template["config.hardware.device"],
template_cluster, template_cluster,
ccr_ref, ccr_ref,
vcenter_name, vcenter_name,
@ -2866,7 +2865,7 @@ CommandParser::CmdParser.new(ARGV) do
main do main do
begin begin
msg = " vCenter pre-migrator tool for OpenNebula 5.4 - Version: 1.0" msg = " vCenter pre-migrator tool for OpenNebula 5.4 - Version: 1.1.3"
logo_banner(msg) logo_banner(msg)
# Initialize opennebula client # Initialize opennebula client