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

Feature #4152: Use SoftLAyer VM FQDN for import name

Browse Source 
(cherry picked from commit d6c206c9cb05749d97a457ca47f0c0319a00926c)
This commit is contained in:
Tino Vazquez 2015-11-16 18:50:41 +01:00
parent ed5cc50932
commit 40574aae17
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cli/onehost
View File

@ -244,7 +244,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
Import VM to OpenNebula
EOT
command :importvm, importvm_desc, :hostid, :name do
command :importvm, importvm_desc, :hostid, :import_id do
helper.perform_action(args[0], options, "imported") do |o|
rc = o.info
next rc if OpenNebula.is_error?(rc)

2
src/vmm_mad/remotes/sl/sl_driver.rb
View File

@ -584,7 +584,7 @@ private
mem = mem.to_i / 1024 # Memory for templates expressed in MB
cpu = cpu.to_f / 100 # CPU expressed in units
str = "NAME = \"Instance from #{i['id']}\"\n"\
str = "NAME = \"#{i['fullyQualifiedDomainName']}\"\n"\
"CPU = \"#{cpu}\"\n"\
"vCPU = \"#{cpu.ceil}\"\n"\
"MEMORY = \"#{mem}\"\n"\