launchpad-reviewers team mailing list archive

["Jeroen T. Vermeulen" <jtv@xxxxxxxxxxxxx>]

Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/revert-maas_tftppath_lp1042877 into lp:maas.

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~jtv/maas/revert-maas_tftppath_lp1042877/+merge/121991

The MP for the reverted branch is at https://code.launchpad.net/~andreserl/maas/maas_tftppath_lp1042877/+merge/121676

After this I'll re-open the bug and get to work on it.


Jeroen
-- 
https://code.launchpad.net/~jtv/maas/revert-maas_tftppath_lp1042877/+merge/121991
Your team MAAS Maintainers is requested to review the proposed merge of lp:~jtv/maas/revert-maas_tftppath_lp1042877 into lp:maas.

=== modified file 'etc/pserv.yaml'
--- etc/pserv.yaml	2012-08-28 18:22:49 +0000
+++ etc/pserv.yaml	2012-08-30 06:33:22 +0000
@@ -31,7 +31,7 @@
 ## TFTP configuration.
 #
 tftp:
-  # root: /var/lib/tftpboot/maas
+  # root: /var/lib/tftpboot
   # port: 69
   port: 5244
   ## The URL to be contacted to generate PXE configurations.

=== modified file 'src/provisioningserver/config.py'
--- src/provisioningserver/config.py	2012-08-28 18:22:49 +0000
+++ src/provisioningserver/config.py	2012-08-30 06:33:22 +0000
@@ -59,7 +59,7 @@
 
     if_key_missing = None
 
-    root = String(if_missing="/var/lib/tftpboot/maas")
+    root = String(if_missing="/var/lib/tftpboot")
     port = Int(min=1, max=65535, if_missing=69)
     generator = String(if_missing=b"http://localhost/MAAS/api/1.0/pxeconfig/";)
 

=== modified file 'src/provisioningserver/pxe/tftppath.py'
--- src/provisioningserver/pxe/tftppath.py	2012-08-28 18:22:49 +0000
+++ src/provisioningserver/pxe/tftppath.py	2012-08-30 06:33:22 +0000
@@ -29,7 +29,7 @@
     simulate PXELINUX and don't actually load `pxelinux.0`, but use its path
     to figure out where configuration files are located.
     """
-    return "pxelinux.0"
+    return "maas/pxelinux.0"
 
 
 # TODO: move this; it is now only used for testing.
@@ -48,7 +48,7 @@
     # Not using os.path.join: this is a TFTP path, not a native path. Yes, in
     # practice for us they're the same. We always assume that the ARP HTYPE
     # (hardware type) that PXELINUX sends is Ethernet.
-    return "pxelinux.cfg/{htype:02x}-{mac}".format(
+    return "maas/pxelinux.cfg/{htype:02x}-{mac}".format(
         htype=ARP_HTYPE.ETHERNET, mac=mac)
 
 
@@ -66,7 +66,7 @@
     :return: Path for the corresponding image directory (containing a
         kernel and initrd) as exposed over TFTP.
     """
-    return '/'.join([arch, subarch, release, purpose])
+    return '/'.join(['maas', arch, subarch, release, purpose])
 
 
 def locate_tftp_path(path, tftproot):