summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-01-18 18:27:08 -0800
committerVishvananda Ishaya <vishvananda@gmail.com>2011-01-18 18:27:08 -0800
commitec5e44eb7bce9429f7861d0cf03bf7bc77c46ae0 (patch)
treed7aadfc5bf69f60ed6fcee3e22402964b51da839 /nova/api
parent4eed55b46cfaba58b5d344f0ca96eba090d8bd34 (diff)
downloadnova-ec5e44eb7bce9429f7861d0cf03bf7bc77c46ae0.tar.gz
nova-ec5e44eb7bce9429f7861d0cf03bf7bc77c46ae0.tar.xz
nova-ec5e44eb7bce9429f7861d0cf03bf7bc77c46ae0.zip
replace old ec2_id with proper id in describe_addresses
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/ec2/cloud.py2
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}