Merge lp:~andreserl/maas/maas_tftppath_lp1042877 into lp:~maas-committers/maas/trunk

[Andres Rodriguez]

Fixes incorrect TFTP path to not prepend maas/

[Julian Edwards (julian-edwards)]

review: Approve

[Jeroen T. Vermeulen (jtv)]

This branch does not pass tests. Andres, did you run “make test” or “make check” before putting this up for review? Lots of failing tests in trunk now. :(

[Julian Edwards (julian-edwards)]

I'll take some blame, I should have checked before I approved.

[Jeroen T. Vermeulen (jtv)]

I suspect the root problem is that different teams come into this with different operating procedures. We in Red Squad are used to running tests before & after any change, and running the full test suite at least before & after landing — but there's really no point doing that for packaging changes, changes to the client-side packages etc... which is the kind of work that the server team has been doing. In this case, the unfortunate circumstance was that Andres normally has no need to do this (and this _looked_ like a mere configuration change that might not affect tests) whereas Julian would normally expect the engineer to have ensured that tests run before review.

Also, our Jenkins setup must definitely be broken. We should have received emails screaming about this.

[Jeroen T. Vermeulen (jtv)]

Meanwhile, if we're stepping away from the /maas prefix completely (are we?) then we should simplify it out of the regex in provisioningserver.tftp.TFTPBackend.re_config_file.

[Gavin Panella (allenap)]

On 30 Aug 2012 03:34, "Jeroen T. Vermeulen" <email address hidden> wrote:
>
> Meanwhile, if we're stepping away from the /maas prefix completely (are
we?) then we should simplify it out of the regex in
provisioningserver.tftp.TFTPBackend.re_config_file.

And bootpath also becomes obsolete (more so than it already is).

=== modified file 'etc/pserv.yaml'
--- etc/pserv.yaml	2012-08-23 19:56:55 +0000
+++ etc/pserv.yaml	2012-08-28 18:26:18 +0000
@@ -31,7 +31,7 @@
 ## TFTP configuration.
 #
 tftp:
-  # root: /var/lib/tftpboot
+  # root: /var/lib/tftpboot/maas
   # 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-24 10:53:26 +0000
+++ src/provisioningserver/config.py	2012-08-28 18:26:18 +0000
@@ -59,7 +59,7 @@
 
     if_key_missing = None
 
-    root = String(if_missing="/var/lib/tftpboot")
+    root = String(if_missing="/var/lib/tftpboot/maas")
     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-17 14:11:20 +0000
+++ src/provisioningserver/pxe/tftppath.py	2012-08-28 18:26:18 +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 "maas/pxelinux.0"
+    return "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 "maas/pxelinux.cfg/{htype:02x}-{mac}".format(
+    return "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(['maas', arch, subarch, release, purpose])
+    return '/'.join([arch, subarch, release, purpose])
 
 
 def locate_tftp_path(path, tftproot):