diff options
| author | Josh Kearney <josh.kearney@rackspace.com> | 2011-01-19 10:40:13 -0600 |
|---|---|---|
| committer | Josh Kearney <josh.kearney@rackspace.com> | 2011-01-19 10:40:13 -0600 |
| commit | 98e27d29182d882ed7153ce9834b3e6a7ea99733 (patch) | |
| tree | 8945d551650bfaf85c749726035e8d23683e76ac /nova/api | |
| parent | 22fc6fc6605b188b5176e6a573aecde8088a0e5e (diff) | |
| parent | 7d7fbf5dfd8a8e10f584df5d27d3479c4b2b4d3a (diff) | |
| download | nova-98e27d29182d882ed7153ce9834b3e6a7ea99733.tar.gz nova-98e27d29182d882ed7153ce9834b3e6a7ea99733.tar.xz nova-98e27d29182d882ed7153ce9834b3e6a7ea99733.zip | |
Merged 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} |