diff options
| author | Kei Masumoto <masumotok@nttdata.co.jp> | 2011-01-18 16:39:26 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-01-18 16:39:26 +0000 |
| commit | 3fa93adb2047ca2b7333ab52d1d8bf15dfac9852 (patch) | |
| tree | 3180f9f99e9f64f7220d0c8d437ec6a5ada00c82 /nova/api | |
| parent | 8e6684a58eea3ecacdde99e1940d2ae351b8465c (diff) | |
| parent | 1dc38833c75d546b1c64d2bcd1f5d9a5bab8836d (diff) | |
| download | nova-3fa93adb2047ca2b7333ab52d1d8bf15dfac9852.tar.gz nova-3fa93adb2047ca2b7333ab52d1d8bf15dfac9852.tar.xz nova-3fa93adb2047ca2b7333ab52d1d8bf15dfac9852.zip | |
Risk of Regression: This patch don’t modify existing functionlities, but I have added some.
1. nova.db.service.sqlalchemy.model.Serivce (adding a column to database)
2. nova.service ( nova-compute needes to insert information defined by 1 above)
So, db migration is necessary for existing user, but just adding columns.
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} |