diff options
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/api/ec2/ec2utils.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/nova/api/ec2/ec2utils.py b/nova/api/ec2/ec2utils.py index f1a7abfbc..a9aa70900 100644 --- a/nova/api/ec2/ec2utils.py +++ b/nova/api/ec2/ec2utils.py @@ -110,12 +110,7 @@ def ec2_id_to_id(ec2_id): def image_ec2_id(image_id, image_type='ami'): """Returns image ec2_id using id and three letter type.""" template = image_type + '-%08x' - try: - return id_to_ec2_id(image_id, template=template) - except ValueError: - #TODO(wwolf): once we have ec2_id -> glance_id mapping - # in place, this wont be necessary - return "ami-00000000" + return id_to_ec2_id(image_id, template=template) def get_ip_info_for_instance_from_nw_info(nw_info): |