diff --git a/src/cli/one_helper/oneimage_helper.rb b/src/cli/one_helper/oneimage_helper.rb index f05aa50652..2c06a64a78 100644 --- a/src/cli/one_helper/oneimage_helper.rb +++ b/src/cli/one_helper/oneimage_helper.rb @@ -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| diff --git a/src/cloud/ec2/etc/templates/m1.small.erb b/src/cloud/ec2/etc/templates/m1.small.erb index b2f47f269a..57fbb2cfc2 100644 --- a/src/cloud/ec2/etc/templates/m1.small.erb +++ b/src/cloud/ec2/etc/templates/m1.small.erb @@ -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=] IMAGE_ID = <%= erb_vm_info[:ec2_img_id] %> INSTANCE_TYPE = <%= erb_vm_info[:instance_type ]%>