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

Support for network in oca

Browse Source 
git-svn-id: http://svn.opennebula.org/one/trunk@719 3034c82b-c49b-4eb3-8279-a7acafdc01c0
This commit is contained in:
Javier Fontán Muiños 2009-07-21 18:15:07 +00:00
parent f065251d92
commit 5f0b2e9472
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/oca/ec2/eco.rb
View File

@ -275,8 +275,8 @@ __END__
<code>0</code>
<name>pending</name>
</instanceState>
<privateDnsName></privateDnsName>
<dnsName></dnsName>
<privateDnsName><%= @vm_info[:vm]["TEMPLATE/NIC/IP"]%></privateDnsName>
<dnsName><%= @vm_info[:vm]["TEMPLATE/NIC/IP"]%></dnsName>
<keyName>default</keyName>
<amiLaunchIndex>0</amiLaunchIndex>
<instanceType><%= @vm_info[:instance_type] %></instanceType>
@ -304,17 +304,17 @@ __END__
</groupSet>
<instancesSet>
<% @vmpool.each do |vm| %>
<% vm.info ; pp vm ; puts 'hostia' %>
<% vm.info %>
<item>
<instanceId><%= vm.id %></instanceId>
<imageId><%= vm['TEMPLATE/IMAGE_ID'] %></imageId>
<instanceState>
<%= render_state(vm) %>
</instanceState>
<privateDnsName>10.0.0.1</privateDnsName>
<dnsName>10.0.0.1</dnsName>
<privateDnsName><%= vm["TEMPLATE/NIC/IP"] %></privateDnsName>
<dnsName><%= vm["TEMPLATE/NIC/IP"] %></dnsName>
<keyName>default</keyName>
<amiLaunchIndex>1</amiLaunchIndex>
<amiLaunchIndex>0</amiLaunchIndex>
<instanceType><%= vm['TEMPLATE/INSTANCE_TYPE'] %></instanceType>
<%= render_launch_time(vm) %>
<placement>

3
src/oca/ec2/templates/m1.small.erb
View File

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