mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-19 03:12:55 +09:00
Change EC2 user_flags
This commit is contained in:
1 parent
5a6af308dc
commit
9c1ab345ed
2 files changed
+3
-4
No files matched your search
@@ -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
|
||||
|
||||
|
||||
@@ -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' %>
|
||||
|
||||
Reference in new issue
Block a user