MAAS

Merge lp:~adam-stokes/maas/1.3 into lp:maas/1.3

  1. 1.3
  2. Merge into 1.3
Proposed by Adam Stokes
Status: Merged
Approved by: Julian Edwards
Approved revision: no longer in the source branch.
Merged at revision: 1468
Proposed branch: lp:~adam-stokes/maas/1.3
Merge into: lp:maas/1.3
Diff against target: 15 lines (+5/-0)
1 file modified
src/provisioningserver/dhcp/config.py (+5/-0)
To merge this branch: bzr merge lp:~adam-stokes/maas/1.3
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Review via email: mp+178193@code.launchpad.net

Commit message

Backport r1541 from trunk:

Limit DHCP lease times to 30 seconds for PXE clients.

Description of the change

  Backport r1541 from trunk:

  Limit DHCP lease times to 30 seconds for PXE clients.

To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/provisioningserver/dhcp/config.py'
2--- src/provisioningserver/dhcp/config.py 2013-06-05 03:41:41 +0000
3+++ src/provisioningserver/dhcp/config.py 2013-08-02 02:48:26 +0000
4@@ -35,6 +35,11 @@
5 option domain-name-servers {{dns_servers}};
6 option routers {{router_ip}};
7 range dynamic-bootp {{ip_range_low}} {{ip_range_high}};
8+ class "PXE" {
9+ match if substring (option vendor-class-identifier, 0, 3) = "PXE";
10+ default-lease-time 30;
11+ max-lease-time 30;
12+ }
13 }
14 omapi-port 7911;
15 key omapi_key {

Subscribers

People subscribed via source and target branches