openstack/nova
Code Issues Proposed changes

Replace an old use of ec2_id with id in describe_addresses.

Browse Source
This commit is contained in:
Vishvananda Ishaya 2011-01-19 02:58:48 +00:00 committed by Tarmac
commit 604be356a0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/api/ec2/cloud.py
View File

@ -729,7 +729,7 @@ class CloudController(object):
ec2_id = None ec2_id = None
if (floating_ip_ref['fixed_ip'] if (floating_ip_ref['fixed_ip']
and floating_ip_ref['fixed_ip']['instance']): and floating_ip_ref['fixed_ip']['instance']):
instance_id = floating_ip_ref['fixed_ip']['instance']['ec2_id'] instance_id = floating_ip_ref['fixed_ip']['instance']['id']
ec2_id = id_to_ec2_id(instance_id) ec2_id = id_to_ec2_id(instance_id)
address_rv = {'public_ip': address, address_rv = {'public_ip': address,
'instance_id': ec2_id} 'instance_id': ec2_id}