launchpad-reviewers team mailing list archive

[Raphaël Badin <raphael.badin@xxxxxxxxxxxxx>]

Raphaël Badin has proposed merging lp:~rvb/maas/fix-dhcpd-template into lp:maas with lp:~rvb/maas/write-dhcp-server-config as a prerequisite.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~rvb/maas/fix-dhcpd-template/+merge/117746

Fix dhcp config template.
-- 
https://code.launchpad.net/~rvb/maas/fix-dhcpd-template/+merge/117746
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/fix-dhcpd-template into lp:maas.

=== modified file 'src/provisioningserver/dhcp/config.py'
--- src/provisioningserver/dhcp/config.py	2012-08-02 11:52:18 +0000
+++ src/provisioningserver/dhcp/config.py	2012-08-02 11:52:18 +0000
@@ -38,10 +38,12 @@
 template_content = dedent("""\
     class "pxe" {
       match if substring (option vendor-class-identifier, 0, 9) = "PXEClient";
+      filename "{{bootloaders['i386', 'generic']}}";
     }
     class "uboot-highbank" {
       match if substring (option vendor-class-identifier, 0, 21) = \
         "U-boot.armv7.highbank";
+      filename "{{bootloaders['arm', 'highbank']}}";
     }
 
     subnet {{subnet}} netmask {{subnet_mask}} {
@@ -51,15 +53,6 @@
            option domain-name-servers {{dns_servers}};
            option routers {{router_ip}};
            range dynamic-bootp {{ip_range_low}} {{ip_range_high}};
-
-           pool {
-                   allow members of "uboot-highbank";
-                   filename "{{bootloaders['arm', 'highbank']}}";
-           }
-           pool {
-                   allow members of "pxe";
-                   filename "{{bootloaders['i386', 'generic']}}";
-           }
     }
     omapi-port 7911;
     key omapi_key {