diff options
| author | Naveed Massjouni <naveedm9@gmail.com> | 2011-04-07 14:08:04 -0400 |
|---|---|---|
| committer | Naveed Massjouni <naveedm9@gmail.com> | 2011-04-07 14:08:04 -0400 |
| commit | 003e8d8191dcf5ed91b48537cee7e661f094897e (patch) | |
| tree | 65d1c35f7408d50493288184adee9dd37bce803d | |
| parent | 40c923061f86f1046f64bb4b58c088c0b3a5c952 (diff) | |
| parent | a782dad0d1effeaebdfb59ad87b88b42c93991ed (diff) | |
| download | nova-003e8d8191dcf5ed91b48537cee7e661f094897e.tar.gz nova-003e8d8191dcf5ed91b48537cee7e661f094897e.tar.xz nova-003e8d8191dcf5ed91b48537cee7e661f094897e.zip | |
Merge from trunk
| -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 58effd134..d9ef43f13 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -785,7 +785,7 @@ class CloudController(object): def allocate_address(self, context, **kwargs): LOG.audit(_("Allocate address"), context=context) public_ip = self.network_api.allocate_floating_ip(context) - return {'addressSet': [{'publicIp': public_ip}]} + return {'publicIp': public_ip} def release_address(self, context, public_ip, **kwargs): LOG.audit(_("Release address %s"), public_ip, context=context) |