From 9c1ab345ed83f31fcee8b3aa91a47366f778c8a5 Mon Sep 17 00:00:00 2001
From: Daniel Molina <danmolin@fdi.ucm.es>
Date: Mon, 11 Jul 2011 18:39:28 +0200
Subject: [PATCH] Change EC2 user_flags

---
 src/cloud/ec2/lib/EC2QueryServer.rb         | 5 ++---
 src/cloud/ec2/lib/views/describe_images.erb | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/cloud/ec2/lib/EC2QueryServer.rb b/src/cloud/ec2/lib/EC2QueryServer.rb
index 03e7f44ecf..1d8c786729 100644
--- a/src/cloud/ec2/lib/EC2QueryServer.rb
+++ b/src/cloud/ec2/lib/EC2QueryServer.rb
@@ -161,11 +161,10 @@ class EC2QueryServer < CloudServer
     end
 
     def describe_images(params, one_client)
-        user_flag=-1
+        user_flag = OpenNebula::Pool::INFO_GROUP
         impool = ImagePool.new(one_client, user_flag)
         impool.info
 
-        erb_user_name = params['AWSAccessKeyId']
         erb_version = params['Version']
 
         response = ERB.new(File.read(@config[:views]+"/describe_images.erb"))
@@ -221,7 +220,7 @@ class EC2QueryServer < CloudServer
     end
 
     def describe_instances(params, one_client)
-        user_flag=-1
+        user_flag = OpenNebula::Pool::INFO_MINE
         vmpool = VirtualMachinePool.new(one_client, user_flag)
         vmpool.info
 
diff --git a/src/cloud/ec2/lib/views/describe_images.erb b/src/cloud/ec2/lib/views/describe_images.erb
index 5ef277ad1a..163241c670 100644
--- a/src/cloud/ec2/lib/views/describe_images.erb
+++ b/src/cloud/ec2/lib/views/describe_images.erb
@@ -13,7 +13,7 @@
 			<% elsif im['STATE'] == '4'%>
 			<imageState>pending</imageState>
 			<% end %>
-			<imageOwnerId><%= erb_user_name %></imageOwnerId>
+			<imageOwnerId><%= im['UNAME'] %></imageOwnerId>
 			<% if im['PUBLIC'] == '0' %>
 			<isPublic>false</isPublic>
 			<% elsif im['PUBLIC'] == '1' %>