diff --git a/src/cli/onevcenter b/src/cli/onevcenter index 49ad0b6067..f492a2e61b 100755 --- a/src/cli/onevcenter +++ b/src/cli/onevcenter @@ -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: "\ diff --git a/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js index 78384721f9..a1ee45ad5f 100644 --- a/src/sunstone/public/js/plugins/hosts-tab.js +++ b/src/sunstone/public/js/plugins/hosts-tab.js @@ -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: ''+ ''+ ''+ @@ -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); diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb index 84b3eec4f6..a9071d80ba 100644 --- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb +++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb @@ -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"