OpenStack Compute (nova)

Merge lp:~abrindeyev/nova/lp785763 into lp:~hudson-openstack/nova/trunk

  1. lp785763
  2. Merge into trunk
Proposed by Andrey Brindeyev
Status: Merged
Approved by: Todd Willey
Approved revision: 1093
Merged at revision: 1100
Proposed branch: lp:~abrindeyev/nova/lp785763
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 29 lines (+3/-0)
2 files modified
Authors (+1/-0)
nova/network/linux_net.py (+2/-0)
To merge this branch: bzr merge lp:~abrindeyev/nova/lp785763
Reviewer Review Type Date Requested Status
Todd Willey (community) Approve
Vish Ishaya (community) Approve
Eldar Nugaev (community) Approve
Review via email: mp+61769@code.launchpad.net

Description of the change

--dhcp-lease-max=150 by default. This prevents >150 instances in one network.

To post a comment you must log in.
Revision history for this message
Eldar Nugaev (reldan) wrote :

Looks reasonable

review: Approve
Revision history for this message
Vish Ishaya (vishvananda) wrote :

nice one. Didn't realize that dnsmasq had a limit there.

review: Approve
Revision history for this message
Todd Willey (xtoddx) wrote :

:)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Authors'
2--- Authors 2011-05-20 06:51:29 +0000
3+++ Authors 2011-05-20 14:03:28 +0000
4@@ -1,4 +1,5 @@
5 Alex Meade <alex.meade@rackspace.com>
6+Andrey Brindeyev <abrindeyev@griddynamics.com>
7 Andy Smith <code@term.ie>
8 Andy Southgate <andy.southgate@citrix.com>
9 Anne Gentle <anne@openstack.org>
10
11=== modified file 'nova/network/linux_net.py'
12--- nova/network/linux_net.py 2011-05-11 19:24:01 +0000
13+++ nova/network/linux_net.py 2011-05-20 14:03:28 +0000
14@@ -27,6 +27,7 @@
15 from nova import flags
16 from nova import log as logging
17 from nova import utils
18+from IPy import IP
19
20
21 LOG = logging.getLogger("nova.linux_net")
22@@ -698,6 +699,7 @@
23 '--listen-address=%s' % net['gateway'],
24 '--except-interface=lo',
25 '--dhcp-range=%s,static,120s' % net['dhcp_start'],
26+ '--dhcp-lease-max=%s' % IP(net['cidr']).len(),
27 '--dhcp-hostsfile=%s' % _dhcp_file(net['bridge'], 'conf'),
28 '--dhcp-script=%s' % FLAGS.dhcpbridge,
29 '--leasefile-ro']