summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2011-12-29 18:16:42 +0000
committerGerrit Code Review <review@openstack.org>2011-12-29 18:16:42 +0000
commitfee0b1e53dee6da5ceaee7d920e5bd538715371e (patch)
tree74c69050b28bd92445e46ff917fc75e48b2747b3
parente135f939a40617ef5b5c9847454c2db066eb72cb (diff)
parent135fd9191677f35c43aaff4f01af7e88cd57acb1 (diff)
downloadnova-fee0b1e53dee6da5ceaee7d920e5bd538715371e.tar.gz
nova-fee0b1e53dee6da5ceaee7d920e5bd538715371e.tar.xz
nova-fee0b1e53dee6da5ceaee7d920e5bd538715371e.zip
Merge "Bug 751229: Floating address range fixed"
-rw-r--r--Authors1
-rwxr-xr-xbin/nova-manage6
2 files changed, 5 insertions, 2 deletions
diff --git a/Authors b/Authors
index 186bb02d3..ef9550f54 100644
--- a/Authors
+++ b/Authors
@@ -57,6 +57,7 @@ Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Hisaki Ohara <hisaki.ohara@intel.com>
Ilya Alekseyev <ilyaalekseyev@acm.org>
Isaku Yamahata <yamahata@valinux.co.jp>
+Ivan Kolodyazhny <e0ne@e0ne.info>
Jake Dahn <jake@ansolabs.com>
James E. Blair <jeblair@hp.com>
Jason Cannavale <jason.cannavale@rackspace.com>
diff --git a/bin/nova-manage b/bin/nova-manage
index 51b5597d2..5fcb555b8 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -682,8 +682,10 @@ class FloatingIpCommands(object):
@args('--ip_range', dest="range", metavar='<range>', help='IP range')
def create(self, range):
"""Creates floating ips for zone by range"""
- for address in netaddr.IPNetwork(range):
- db.floating_ip_create(context.get_admin_context(),
+ addresses = netaddr.IPNetwork(range)
+ admin_context = context.get_admin_context()
+ for address in addresses.iter_hosts():
+ db.floating_ip_create(admin_context,
{'address': str(address)})
@args('--ip_range', dest="ip_range", metavar='<range>', help='IP range')