diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-23 05:17:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-23 05:17:12 +0000 |
| commit | 4fedcd7a8a88152b48102c01a653144d1947be15 (patch) | |
| tree | 9dff24b193703aa1241cdca4256124d23b4635e8 /nova/api | |
| parent | d0daaeedae8f0a5fd4a32d2e29df365588f15f7f (diff) | |
| parent | c199fd6fa39311305b5b5d94c2e3732b826a6414 (diff) | |
| download | nova-4fedcd7a8a88152b48102c01a653144d1947be15.tar.gz nova-4fedcd7a8a88152b48102c01a653144d1947be15.tar.xz nova-4fedcd7a8a88152b48102c01a653144d1947be15.zip | |
Merge "Remove outdated try except block in ec2 code"
Diffstat (limited to 'nova/api')
| -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): |