summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-01-05 12:42:36 +0000
committerGerrit Code Review <review@openstack.org>2012-01-05 12:42:36 +0000
commit07bbedcfb2ad6f0e677bc90af27a10c9023d2062 (patch)
tree77d612ef0941aaf3a439b52805b85aa8bdf0f699
parent30c388554b38880c722e638340184961beb38972 (diff)
parent1085e9d0fdc81eea734482e42a5fcb6ae1f4e8f7 (diff)
downloadnova-07bbedcfb2ad6f0e677bc90af27a10c9023d2062.tar.gz
Merge "Bug 751229: Floating address range fixed" into stable/diablo
-rw-r--r--Authors1
-rwxr-xr-xbin/nova-manage6
2 files changed, 5 insertions, 2 deletions
diff --git a/Authors b/Authors
index a9266b25bc..9c0f5c5663 100644
--- a/Authors
+++ b/Authors
@@ -48,6 +48,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 3ff73f19a4..45d649e5d1 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -683,8 +683,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')