diff options
| author | Josh Kearney <josh.kearney@rackspace.com> | 2011-01-18 11:08:33 -0600 |
|---|---|---|
| committer | Josh Kearney <josh.kearney@rackspace.com> | 2011-01-18 11:08:33 -0600 |
| commit | 084eb7e96d9201e4616d49211cb80acaa717560b (patch) | |
| tree | b75a0344e414189b3d370dd28c578fd4910d7627 /nova/api | |
| parent | be54850d6268243d9e6deee9768b0a112c526c39 (diff) | |
| parent | 3fa93adb2047ca2b7333ab52d1d8bf15dfac9852 (diff) | |
| download | nova-084eb7e96d9201e4616d49211cb80acaa717560b.tar.gz nova-084eb7e96d9201e4616d49211cb80acaa717560b.tar.xz nova-084eb7e96d9201e4616d49211cb80acaa717560b.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} |