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

Change EC2 user_flags

Browse Source
This commit is contained in:
Daniel Molina 2011-07-11 18:39:28 +02:00
parent 5a6af308dc
commit 9c1ab345ed
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cloud/ec2/lib/EC2QueryServer.rb
View File

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

2
src/cloud/ec2/lib/views/describe_images.erb
View File

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