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

Feature #3383: Solve various issues related to import running vCenter VMs

Browse Source
This commit is contained in:
Tino Vazquez 2015-02-12 18:04:29 +01:00
parent d5964950da
commit 4e5ca2df75
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cli/onevcenter
View File

@ -277,7 +277,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
"#{rc.message}\n"
end
rc = one_v.deploy v[:host_id], true # Force deployment
rc = one_v.deploy v[:host_id]
if ::OpenNebula.is_error?(rc)
STDOUT.puts " Error creating Virtual Machine: "\

4
src/sunstone/public/js/plugins/hosts-tab.js
View File

@ -1168,7 +1168,7 @@ function fillVCenterVMs(opts) {
var path = '/vcenter/vms';
opts.container.html(generateAdvancedSection({
html_id: path,
title: tr("Runing VMs"),
title: tr("Running VMs"),
content: '<span class="fa-stack fa-2x" style="color: #dfdfdf">'+
'<i class="fa fa-cloud fa-stack-2x"></i>'+
'<i class="fa fa-spinner fa-spin fa-stack-1x fa-inverse"></i>'+
@ -1720,7 +1720,7 @@ function setupCreateHostDialog(){
extra_info['host_id'] = host_id_to_deploy;
extra_info['ds_id'] = -1;
extra_info['enforce'] = true;
extra_info['enforce'] = false;
Sunstone.runAction("VM.deploy_action", response.VM.ID, extra_info);

6
src/vmm_mad/remotes/vcenter/vcenter_driver.rb
View File

@ -622,6 +622,8 @@ class VCenterHost < ::OpenNebula::Host
vm = VCenterVm.new(@client, v)
vm.monitor
next if !vm.vm.config
str_info << "\nVM = ["
str_info << "ID=#{number},"
str_info << "DEPLOY_ID=\"#{vm.vm.config.uuid}\","
@ -1045,10 +1047,6 @@ class VCenterVm
" TYPE =\"vcenter\",\n"\
" VM_TEMPLATE =\"#{@vm.config.uuid}\"\n"\
"]\n"\
"GRAPHICS = [\n"\
" TYPE =\"vnc\",\n"\
" LISTEN =\"0.0.0.0\"\n"\
"]\n"\
"IMPORT_VM_ID = \"#{@vm.config.uuid}\"\n"\
"SCHED_REQUIREMENTS=\"NAME=\\\"#{@vm.runtime.host.parent.name}\\\"\"\n"