mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-20 11:52:37 +09:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
bca050bbd4
2 files changed
+2
-3
No files matched your search
@@ -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']]
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in new issue
Block a user