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']] 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"