diff options
| author | Anthony Young <sleepsonthefloor@gmail.com> | 2011-01-18 18:14:03 -0800 |
|---|---|---|
| committer | Anthony Young <sleepsonthefloor@gmail.com> | 2011-01-18 18:14:03 -0800 |
| commit | d5fd7b68d2ec4b4ee3cf6de6b7c10a00300a81a0 (patch) | |
| tree | e7a9bb2663df78f43a729c381cdd0508981cd02b /nova/api | |
| parent | 76a4d683d973c7f8120ae6b409d9fd9c09a3ab98 (diff) | |
| parent | 9d76fb7d6bb88c7b8e1e78d076168ac58a6d978a (diff) | |
merge vish's changes (which merged trunk and fixed a pep8 problem)
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 c94540793..57d41ed67 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']['id'] + instance_id = floating_ip_ref['fixed_ip']['instance']['ec2_id'] ec2_id = id_to_ec2_id(instance_id) address_rv = {'public_ip': address, 'instance_id': ec2_id} |