bug #3321: Update references to EC2_INSTANCE_TYPE

(cherry picked from commit d3bd5f7fab)
This commit is contained in:
Ruben S. Montero committed 2014-11-10 00:05:50 +01:00
1 parent 4f7519def3
commit 40626344fc
3 files changed
+3 -3

No files matched your search

+1 -1
View File
@@ -17,7 +17,7 @@ DISK = [ IMAGE_ID = <%= erb_vm_info[:img_id] %> ]
NIC=[NETWORK_ID=<EC2-VNET-ID>]
IMAGE_ID = <%= erb_vm_info[:ec2_img_id] %>
INSTANCE_TYPE = <%= erb_vm_info[:instance_type ]%>
EC2_INSTANCE_TYPE = <%= erb_vm_info[:instance_type ]%>
<% if erb_vm_info[:user_data] && erb_vm_info[:public_key] %>
CONTEXT = [ EC2_USER_DATA="<%= erb_vm_info[:user_data] %>", EC2_PUBLIC_KEY="<%= erb_vm_info[:public_key] %>", EC2_KEYNAME ="<%= erb_vm_info[:key_name] %>" ]
@@ -31,7 +31,7 @@
<keyName><%= vm['TEMPLATE/CONTEXT/EC2_KEYNAME'] %></keyName>
<% end %>
<productCodes/>
<instanceType><%= vm['USER_TEMPLATE/INSTANCE_TYPE'] %></instanceType>
<instanceType><%= vm['USER_TEMPLATE/EC2_INSTANCE_TYPE'] %></instanceType>
<%= render_launch_time(vm) %>
<placement>
<availabilityZone>default</availabilityZone>
+1 -1
View File
@@ -24,7 +24,7 @@
<% else %>
<keyName><%= vm['TEMPLATE/CONTEXT/EC2_KEYNAME'] %></keyName>
<% end %>
<instanceType><%= vm['USER_TEMPLATE/INSTANCE_TYPE'] %></instanceType>
<instanceType><%= vm['USER_TEMPLATE/EC2_INSTANCE_TYPE'] %></instanceType>
<%= render_launch_time(vm) %>
<placement>
<availabilityZone>default</availabilityZone>