diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-01-19 02:58:48 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-01-19 02:58:48 +0000 |
| commit | 604be356a02653f945c3f2fcc58a04c4a0acae3c (patch) | |
| tree | d7aadfc5bf69f60ed6fcee3e22402964b51da839 /nova | |
| parent | 4eed55b46cfaba58b5d344f0ca96eba090d8bd34 (diff) | |
| parent | ec5e44eb7bce9429f7861d0cf03bf7bc77c46ae0 (diff) | |
| download | nova-604be356a02653f945c3f2fcc58a04c4a0acae3c.tar.gz nova-604be356a02653f945c3f2fcc58a04c4a0acae3c.tar.xz nova-604be356a02653f945c3f2fcc58a04c4a0acae3c.zip | |
Replace an old use of ec2_id with id in describe_addresses.
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/api/ec2/cloud.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 57d41ed67..c94540793 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -729,7 +729,7 @@ class CloudController(object): ec2_id = None if (floating_ip_ref['fixed_ip'] 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) address_rv = {'public_ip': address, 'instance_id': ec2_id} |