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

bug #3396: econe-register should accept both ami-ID or ID options as an arg

Browse Source 
(cherry picked from commit 7e8693d6d74214cbffefc8ab5883b1390fbb4729)
This commit is contained in:
Daniel Molina 2014-12-12 17:40:25 +01:00
parent da7b29738e
commit 8a0f49d8a4
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,8 +132,12 @@ class EC2QueryServer < CloudServer
def register_image(params)
# Get the Image ID
image_id = params['ImageLocation']
image = ImageEC2.new(Image.build_xml(image_id.to_i), @client)
if image_id =~ /ami\-(.+)/
image_id = $1
end
image = ImageEC2.new(Image.build_xml(image_id.to_i), @client)
rc = image.info
if OpenNebula.is_error?(rc)
return rc