diff options
| author | Todd Willey <todd@ansolabs.com> | 2011-01-18 14:30:26 -0500 |
|---|---|---|
| committer | Todd Willey <todd@ansolabs.com> | 2011-01-18 14:30:26 -0500 |
| commit | be8b74ff0226557df01d4bdce2c76d0157e09b8f (patch) | |
| tree | 397108295f5b46e8e574d95921515b3de16e1461 /nova/api | |
| parent | 11a10dc9a2fcaaf94e9c661fc9162fd5b8bd420e (diff) | |
| parent | 4577c11923f05ba60ec898186d3f959d86e5de4c (diff) | |
Merge trunk.
Diffstat (limited to 'nova/api')
| -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} |