diff options
| author | Todd Willey <todd@ansolabs.com> | 2011-01-18 17:42:00 -0500 |
|---|---|---|
| committer | Todd Willey <todd@ansolabs.com> | 2011-01-18 17:42:00 -0500 |
| commit | 19aae256676e45a8147f25553398ca980b3e1bd4 (patch) | |
| tree | d8a78787a0a1d93d719c7615b6223e3fae3bec27 /nova/api | |
| parent | d4e7eb818c9f4ec51fd3a88a0e92d557867511d4 (diff) | |
| parent | 5b496ed35c53869623e4a968ab9d310089f3bfb2 (diff) | |
Trunk merge.
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} |