summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasanori Itoh <itoumsn@nttdata.co.jp>2011-04-07 17:30:01 +0000
committerTarmac <>2011-04-07 17:30:01 +0000
commita782dad0d1effeaebdfb59ad87b88b42c93991ed (patch)
treef5499e10f6106e9717efe21ecb265a1db51c62b4
parent7bd99e33796f1e90b6f8b0b9caa122c541f99015 (diff)
parent8c3781608836b18d210dca82697b828b79c0f4ec (diff)
downloadnova-a782dad0d1effeaebdfb59ad87b88b42c93991ed.tar.gz
nova-a782dad0d1effeaebdfb59ad87b88b42c93991ed.tar.xz
nova-a782dad0d1effeaebdfb59ad87b88b42c93991ed.zip
Remove <addressSet> and <item> from AllocateAddress response, and fix bug #751176.
-rw-r--r--nova/api/ec2/cloud.py2
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)