diff --git a/src/oca/ec2/eco.rb b/src/oca/ec2/eco.rb index 7e3879c5fd..85015f2249 100644 --- a/src/oca/ec2/eco.rb +++ b/src/oca/ec2/eco.rb @@ -275,8 +275,8 @@ __END__ 0 pending - - + <%= @vm_info[:vm]["TEMPLATE/NIC/IP"]%> + <%= @vm_info[:vm]["TEMPLATE/NIC/IP"]%> default 0 <%= @vm_info[:instance_type] %> @@ -304,17 +304,17 @@ __END__ <% @vmpool.each do |vm| %> - <% vm.info ; pp vm ; puts 'hostia' %> + <% vm.info %> <%= vm.id %> <%= vm['TEMPLATE/IMAGE_ID'] %> <%= render_state(vm) %> - 10.0.0.1 - 10.0.0.1 + <%= vm["TEMPLATE/NIC/IP"] %> + <%= vm["TEMPLATE/NIC/IP"] %> default - 1 + 0 <%= vm['TEMPLATE/INSTANCE_TYPE'] %> <%= render_launch_time(vm) %> diff --git a/src/oca/ec2/templates/m1.small.erb b/src/oca/ec2/templates/m1.small.erb index 97a2ce39b7..75883aa748 100644 --- a/src/oca/ec2/templates/m1.small.erb +++ b/src/oca/ec2/templates/m1.small.erb @@ -15,6 +15,9 @@ DISK = [ source = <%= @vm_info[:img_path] %>, readonly = no] +NIC=[NETWORK="Public EC2"] + + IMAGE_ID = <%= @vm_info[:img_id] %> INSTANCE_TYPE = <%= @vm_info[:instance_type ]%>