From d9515d5023b3ca3d611cf6f93ba835936b91edf0 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Fri, 13 Jan 2012 16:34:14 +0100 Subject: [PATCH 1/4] Get rid of unused qemu protocol variable for VMware --- src/vmm_mad/remotes/vmware/vmwarerc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/vmm_mad/remotes/vmware/vmwarerc b/src/vmm_mad/remotes/vmware/vmwarerc index 16b448fa48..9baf506bfc 100644 --- a/src/vmm_mad/remotes/vmware/vmwarerc +++ b/src/vmm_mad/remotes/vmware/vmwarerc @@ -16,7 +16,6 @@ # Libvirt configuration :libvirt_uri: "esx://@HOST@/?no_verify=1" -:qemu_protocol: "qemu" # Username and password of the VMware hypervisor :username: "oneadmin" From 673b3cd03f4c24a567401ec1d06f3f6b567ea538 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Fri, 13 Jan 2012 17:09:43 +0100 Subject: [PATCH 2/4] bug #1061: Fix oneimage show --- src/cli/one_helper/oneimage_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cli/one_helper/oneimage_helper.rb b/src/cli/one_helper/oneimage_helper.rb index 3a02c0d92a..0387ed3a71 100644 --- a/src/cli/one_helper/oneimage_helper.rb +++ b/src/cli/one_helper/oneimage_helper.rb @@ -67,8 +67,8 @@ class OneImageHelper < OpenNebulaHelper::OneHelper puts str % ["PERSISTENT", OpenNebulaHelper.boolean_to_str(image["PERSISTENT"])] puts str % ["SOURCE",image['SOURCE']] - puts str % ["PATH",image['PATH']] if !image['PATH'].empty? - puts str % ["FSTYPE",image['FSTYPE']] if !image['FSTYPE'].empty? + puts str % ["PATH",image['PATH']] if image['PATH'] && !image['PATH'].empty? + puts str % ["FSTYPE",image['FSTYPE']] if image['FSTYPE'] && !image['FSTYPE'].empty? puts str % ["SIZE", image['SIZE']] puts str % ["STATE", image.short_state_str] puts str % ["RUNNING_VMS", image['RUNNING_VMS']] From 0d9e45ca2fa3aa2c083d694f63e3c38c3ec41a48 Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Fri, 13 Jan 2012 13:16:34 +0100 Subject: [PATCH 3/4] Ozones: preload selected zone hosts when opening create vdc dialog (cherry picked from commit 7b50ba8e4a4135e5402295742e7347d7c894dad9) --- src/ozones/Server/public/js/plugins/vdcs-tab.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ozones/Server/public/js/plugins/vdcs-tab.js b/src/ozones/Server/public/js/plugins/vdcs-tab.js index 902744f212..47e827489f 100644 --- a/src/ozones/Server/public/js/plugins/vdcs-tab.js +++ b/src/ozones/Server/public/js/plugins/vdcs-tab.js @@ -517,6 +517,7 @@ function setupCreateVDCDialog(){ function openCreateVDCDialog(){ var dialog = $('div#create_vdc_dialog') $('select#zoneid',dialog).html(zones_select); + $('select#zoneid',dialog).trigger("change"); $('#vdc_available_hosts_list',dialog).empty(); $('#vdc_selected_hosts_list',dialog).empty(); dialog.dialog('open'); From 22861df6a8a81e7c53688ea950de292f74073529 Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Fri, 13 Jan 2012 15:16:58 +0100 Subject: [PATCH 4/4] Ozones: Add "/" to the end of sunstone public link (cherry picked from commit 0bee9b76f6b835f23bf8d5cf6f307464970e7e46) --- src/ozones/Server/public/js/plugins/vdcs-tab.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ozones/Server/public/js/plugins/vdcs-tab.js b/src/ozones/Server/public/js/plugins/vdcs-tab.js index 47e827489f..2077aa5e2e 100644 --- a/src/ozones/Server/public/js/plugins/vdcs-tab.js +++ b/src/ozones/Server/public/js/plugins/vdcs-tab.js @@ -287,7 +287,7 @@ function updateVDCInfo(req,vdc_json){ if (zone_match){ zone_host = zone_match[1]; zone_port = zone_match[2]; - sun_link = "http://" + zone_host +"/sunstone_"+ vdc.NAME; + sun_link = "http://" + zone_host +"/sunstone_"+ vdc.NAME+"/"; }; var info_tab = {