shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

Merge branch 'master' of git.opennebula.org:one

Browse Source
This commit is contained in:
Ruben S. Montero 2011-07-11 17:24:06 +02:00
commit 4ef4333373
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cli/one_helper/oneimage_helper.rb
View File

@ -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
src/cloud/ec2/etc/templates/m1.small.erb
View File

@ -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 ]%>