diff options
| author | Andy Smith <code@term.ie> | 2011-01-18 11:01:16 -0800 |
|---|---|---|
| committer | Andy Smith <code@term.ie> | 2011-01-18 11:01:16 -0800 |
| commit | d91229f7a3b60095677e1bb76a548668c59ee9e2 (patch) | |
| tree | 11ce1d8116abce7a062294e9375259eae8817c6b /nova/api | |
| parent | 3fa93adb2047ca2b7333ab52d1d8bf15dfac9852 (diff) | |
revert live_migration branch
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} |