From 1faf77248409bac4226822d48cfdd6213be5e24c Mon Sep 17 00:00:00 2001
From: Andrey Brindeyev <abrindeyev@griddynamics.com>
Date: Fri, 20 May 2011 17:57:04 +0400
Subject: Addressing bug #785763. Usual default for maximum number of DHCP
 leases in dnsmasq is 150. This prevents instances to obtain IP addresses from
 DHCP in case we have more than 150 in our network. Adding myself to Authors.

---
 Authors                   | 1 +
 nova/network/linux_net.py | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/Authors b/Authors
index 546c9091f..6741c81ff 100644
--- a/Authors
+++ b/Authors
@@ -1,4 +1,5 @@
 Alex Meade <alex.meade@rackspace.com>
+Andrey Brindeyev <abrindeyev@griddynamics.com>
 Andy Smith <code@term.ie>
 Andy Southgate <andy.southgate@citrix.com>
 Anne Gentle <anne@openstack.org>
diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py
index 85c4c278c..1fe77d7f1 100644
--- a/nova/network/linux_net.py
+++ b/nova/network/linux_net.py
@@ -27,6 +27,7 @@ from nova import exception
 from nova import flags
 from nova import log as logging
 from nova import utils
+from IPy import IP
 
 
 LOG = logging.getLogger("nova.linux_net")
@@ -698,6 +699,7 @@ def _dnsmasq_cmd(net):
            '--listen-address=%s' % net['gateway'],
            '--except-interface=lo',
            '--dhcp-range=%s,static,120s' % net['dhcp_start'],
+           '--dhcp-lease-max=%s' % IP(net['cidr']).len(),
            '--dhcp-hostsfile=%s' % _dhcp_file(net['bridge'], 'conf'),
            '--dhcp-script=%s' % FLAGS.dhcpbridge,
            '--leasefile-ro']
-- 
cgit