Merge lp:~blake-rouse/maas/fix-1521618 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Move class PXE to global in dhcpd.conf.template.

I have QA'd this by testing that PXE booting still works and that the gateway_ip is not sent from the other subnet. This does resolve the bug.

[Blake Rouse (blake-rouse)]

Self-approving as it just changes its location and I fully QA'd this.

review: Approve

[Andres Rodriguez (andreserl)]

I was just gonna ask about this. So if we have multiple dynamic ranges or
multiple subnets with dynamic ranges in the same vlan, would this just work?

On Thursday, May 12, 2016, Blake Rouse <email address hidden> wrote:

> Blake Rouse has proposed merging lp:~blake-rouse/maas/fix-1521618 into
> lp:maas.
>
> Commit message:
> Move class PXE to global in dhcpd.conf.template.
>
> Requested reviews:
> MAAS Maintainers (maas-maintainers)
> Related bugs:
> Bug #1521618 in MAAS: "wrong subnet in DHCP answer when multiple
> networks are present"
> https://bugs.launchpad.net/maas/+bug/1521618
>
> For more details, see:
> https://code.launchpad.net/~blake-rouse/maas/fix-1521618/+merge/294553
>
> I have QA'd this by testing that PXE booting still works and that the
> gateway_ip is not sent from the other subnet. This does resolve the bug.
> --
> You are subscribed to branch lp:maas.
>

--
Andres Rodriguez (RoAkSoAx)
Ubuntu Server Developer
MSc. Telecom & Networking
Systems Engineer

[Blake Rouse (blake-rouse)]

Yes it works. The other scopes pull from their parent scope.

=== modified file 'src/provisioningserver/templates/dhcp/dhcpd.conf.template'
--- src/provisioningserver/templates/dhcp/dhcpd.conf.template	2016-04-13 17:21:33 +0000
+++ src/provisioningserver/templates/dhcp/dhcpd.conf.template	2016-05-12 19:06:03 +0000
@@ -22,6 +22,15 @@
 {{bootloader}}
 
 #
+# Shorter lease time for PXE booting
+#
+class "PXE" {
+   match if substring (option vendor-class-identifier, 0, 3) = "PXE";
+   default-lease-time 30;
+   max-lease-time 30;
+}
+
+#
 # Failover Peers
 #
 {{for failover_peer in failover_peers}}
@@ -72,12 +81,6 @@
            {{dhcp_snippet['value']}}
            {{endfor}}
 
-           class "PXE" {
-              match if substring (option vendor-class-identifier, 0, 3) = "PXE";
-              default-lease-time 30;
-              max-lease-time 30;
-           }
-
            {{for pool in dhcp_subnet['pools']}}
            pool {
               {{if pool.get('failover_peer')}}