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
=== modified file 'Authors'
--- Authors 2011-05-20 06:51:29 +0000
+++ Authors 2011-05-20 14:03:28 +0000
@@ -1,4 +1,5 @@
1Alex Meade <alex.meade@rackspace.com>1Alex Meade <alex.meade@rackspace.com>
2Andrey Brindeyev <abrindeyev@griddynamics.com>
2Andy Smith <code@term.ie>3Andy Smith <code@term.ie>
3Andy Southgate <andy.southgate@citrix.com>4Andy Southgate <andy.southgate@citrix.com>
4Anne Gentle <anne@openstack.org>5Anne Gentle <anne@openstack.org>
56
=== modified file 'nova/network/linux_net.py'
--- nova/network/linux_net.py 2011-05-11 19:24:01 +0000
+++ nova/network/linux_net.py 2011-05-20 14:03:28 +0000
@@ -27,6 +27,7 @@
27from nova import flags27from nova import flags
28from nova import log as logging28from nova import log as logging
29from nova import utils29from nova import utils
30from IPy import IP
3031
3132
32LOG = logging.getLogger("nova.linux_net")33LOG = logging.getLogger("nova.linux_net")
@@ -698,6 +699,7 @@
698 '--listen-address=%s' % net['gateway'],699 '--listen-address=%s' % net['gateway'],
699 '--except-interface=lo',700 '--except-interface=lo',
700 '--dhcp-range=%s,static,120s' % net['dhcp_start'],701 '--dhcp-range=%s,static,120s' % net['dhcp_start'],
702 '--dhcp-lease-max=%s' % IP(net['cidr']).len(),
701 '--dhcp-hostsfile=%s' % _dhcp_file(net['bridge'], 'conf'),703 '--dhcp-hostsfile=%s' % _dhcp_file(net['bridge'], 'conf'),
702 '--dhcp-script=%s' % FLAGS.dhcpbridge,704 '--dhcp-script=%s' % FLAGS.dhcpbridge,
703 '--leasefile-ro']705 '--leasefile-ro']