mirror of
https://github.com/OpenNebula/one.git
synced 2025-03-16 22:50:10 +03:00
Merge branch 'master' of git.opennebula.org:one
This commit is contained in:
commit
4ef4333373
@ -67,7 +67,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
|
||||
puts str % ["PUBLIC",
|
||||
OpenNebulaHelper.boolean_to_str(image['PUBLIC'])]
|
||||
puts str % ["PERSISTENT",
|
||||
OneImageHelper.boolean_to_str(image["PERSISTENT"])]
|
||||
OpenNebulaHelper.boolean_to_str(image["PERSISTENT"])]
|
||||
puts str % ["SOURCE", image['SOURCE']]
|
||||
puts str % ["STATE", image.short_state_str]
|
||||
puts str % ["RUNNING_VMS", image['RUNNING_VMS']]
|
||||
@ -114,7 +114,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
|
||||
|
||||
column :PERSISTENT, "Whether the Image is persistent or not",
|
||||
:size=>3 do |d|
|
||||
OneImageHelper.boolean_to_str(d["PERSISTENT"])
|
||||
OpenNebulaHelper.boolean_to_str(d["PERSISTENT"])
|
||||
end
|
||||
|
||||
column :STAT, "State of the Image", :size=>4 do |d|
|
||||
|
@ -5,7 +5,7 @@ NAME = eco-vm
|
||||
CPU = 0.2
|
||||
MEMORY = 256
|
||||
|
||||
#Put here specific OS configurations for the cloud hypervisors
|
||||
# Put here specific OS configurations for the cloud hypervisors
|
||||
#OS = [ kernel = /vmlinuz,
|
||||
# initrd = /initrd.img,
|
||||
# root = sda1,
|
||||
@ -13,7 +13,8 @@ MEMORY = 256
|
||||
|
||||
DISK = [ IMAGE_ID = <%= erb_vm_info[:img_id] %> ]
|
||||
|
||||
NIC=[NETWORK="Public EC2"]
|
||||
# Put here the ID of the VNET with the IPs for the EC2 VMs
|
||||
NIC=[NETWORK_ID=<EC2-VNET-ID>]
|
||||
|
||||
IMAGE_ID = <%= erb_vm_info[:ec2_img_id] %>
|
||||
INSTANCE_TYPE = <%= erb_vm_info[:instance_type ]%>
|
||||
|
Loading…
x
Reference in New Issue
Block a user