From d3bd5f7fab520480ee8b64c3c1d5fc3dec688320 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Mon, 10 Nov 2014 00:03:59 +0100
Subject: [PATCH] bug #3321: Update references to EC2_INSTANCE_TYPE

---
 src/cloud/ec2/etc/templates/m1.small.erb       | 2 +-
 src/cloud/ec2/lib/views/describe_instances.erb | 2 +-
 src/cloud/ec2/lib/views/run_instances.erb      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cloud/ec2/etc/templates/m1.small.erb b/src/cloud/ec2/etc/templates/m1.small.erb
index cbd2622364..382cbbcdba 100644
--- a/src/cloud/ec2/etc/templates/m1.small.erb
+++ b/src/cloud/ec2/etc/templates/m1.small.erb
@@ -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] %>" ]
diff --git a/src/cloud/ec2/lib/views/describe_instances.erb b/src/cloud/ec2/lib/views/describe_instances.erb
index c4a5ebe63d..cb3453fa3b 100644
--- a/src/cloud/ec2/lib/views/describe_instances.erb
+++ b/src/cloud/ec2/lib/views/describe_instances.erb
@@ -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>
diff --git a/src/cloud/ec2/lib/views/run_instances.erb b/src/cloud/ec2/lib/views/run_instances.erb
index 0b4875415d..74ff40b444 100644
--- a/src/cloud/ec2/lib/views/run_instances.erb
+++ b/src/cloud/ec2/lib/views/run_instances.erb
@@ -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>