launchpad-reviewers team mailing list archive

[Julian Edwards <julian.edwards@xxxxxxxxxxxxx>]

Julian Edwards has proposed merging lp:~julian-edwards/maas/enlistment-preseed-fix into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1034228 in MAAS: "maas-enlist script hard codes the path to the maas server"
  https://bugs.launchpad.net/maas/+bug/1034228

For more details, see:
https://code.launchpad.net/~julian-edwards/maas/enlistment-preseed-fix/+merge/119495
-- 
https://code.launchpad.net/~julian-edwards/maas/enlistment-preseed-fix/+merge/119495
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~julian-edwards/maas/enlistment-preseed-fix into lp:maas.

=== modified file 'contrib/preseeds_v2/enlist_userdata'
--- contrib/preseeds_v2/enlist_userdata	2012-08-03 20:26:59 +0000
+++ contrib/preseeds_v2/enlist_userdata	2012-08-14 09:26:19 +0000
@@ -7,8 +7,8 @@
  - &maas_enlist |
    # we could obtain the interface that booted from the kernel cmdline
    # thanks to 'IPAPPEND' (http://www.syslinux.org/wiki/index.php/SYSLINUX)
-   host="{{server_host}}"
-   maas-enlist --serverurl "$host" >/tmp/enlist.out
+   url="{{server_url}}"
+   maas-enlist --serverurl "$url" >/tmp/enlist.out
    if [ $? -eq 0 ]; then
       echo
       echo "=== $(date -R): successfully enlisted system to $host ==="

=== modified file 'src/maasserver/preseed.py'
--- src/maasserver/preseed.py	2012-08-06 11:42:08 +0000
+++ src/maasserver/preseed.py	2012-08-14 09:26:19 +0000
@@ -214,6 +214,7 @@
     context = {
         'release': release,
         'server_host': server_host,
+        'server_url': absolute_reverse('nodes_handler'),
         'metadata_enlist_url': absolute_reverse('enlist'),
         }
     if node is not None:

=== modified file 'src/maasserver/tests/test_preseed.py'
--- src/maasserver/tests/test_preseed.py	2012-08-06 11:42:08 +0000
+++ src/maasserver/tests/test_preseed.py	2012-08-14 09:26:19 +0000
@@ -307,7 +307,7 @@
         context = get_preseed_context(node, release)
         self.assertItemsEqual(
             ['node', 'release', 'metadata_enlist_url',
-             'server_host', 'preseed_data',
+             'server_host', 'server_url', 'preseed_data',
              'node_disable_pxe_url', 'node_disable_pxe_data'],
             context)
 
@@ -318,7 +318,7 @@
         release = factory.getRandomString()
         context = get_preseed_context(None, release)
         self.assertItemsEqual(
-            ['release', 'metadata_enlist_url', 'server_host'],
+            ['release', 'metadata_enlist_url', 'server_host', 'server_url'],
             context)