diff options
| author | Ed Leafe <ed@leafe.com> | 2011-01-19 10:41:30 -0500 |
|---|---|---|
| committer | Ed Leafe <ed@leafe.com> | 2011-01-19 10:41:30 -0500 |
| commit | ea812e66a4d2d84af8c63281c35c4109be1f67db (patch) | |
| tree | 6e34fd2cead93cd689c3d60f615a3aba30d46704 /nova/api | |
| parent | c4ecab260bed2118b119c7e415c2682e689fca3b (diff) | |
| parent | 7d7fbf5dfd8a8e10f584df5d27d3479c4b2b4d3a (diff) | |
merged trunk changes
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index cf3a5d2b3..05976afb9 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -730,7 +730,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} @@ -841,8 +841,8 @@ class CloudController(object): if image_location is None and 'name' in kwargs: image_location = kwargs['name'] image_id = self.image_service.register(context, image_location) - msg = _("Registered image %(image_location)s with id %(image_id)s") - % locals() + msg = _("Registered image %(image_location)s with" + " id %(image_id)s") % locals() LOG.audit(msg, context=context) return {'imageId': image_id} |