MAAS

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

  1. fix-enlistment
  2. Merge into trunk
Proposed by Blake Rouse
Status: Merged
Approved by: Blake Rouse
Approved revision: no longer in the source branch.
Merged at revision: 2959
Proposed branch: lp:~blake-rouse/maas/fix-enlistment
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 15 lines (+5/-0)
1 file modified
src/provisioningserver/boot/windows.py (+5/-0)
To merge this branch: bzr merge lp:~blake-rouse/maas/fix-enlistment
Reviewer Review Type Date Requested Status
Julian Edwards (community) Needs Fixing
Raphaël Badin (community) Approve
Review via email: mp+234326@code.launchpad.net

Commit message

Fix get_page in WindowsBootMethod to handle No Content error, on enlistment.

To post a comment you must log in.
Revision history for this message
Raphaël Badin (rvb) :
review: Approve
Revision history for this message
Julian Edwards (julian-edwards) wrote :

This needs a test.

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/provisioningserver/boot/windows.py'
--- src/provisioningserver/boot/windows.py 2014-09-09 20:39:00 +0000
+++ src/provisioningserver/boot/windows.py 2014-09-11 15:50:47 +0000
@@ -194,6 +194,11 @@
194 d = backend.get_page(url)194 d = backend.get_page(url)
195 d.addCallback(json.loads)195 d.addCallback(json.loads)
196 d.addCallback(set_remote_mac)196 d.addCallback(set_remote_mac)
197 # Ignore all errors. If communication to pxeconfig fails, then
198 # we don't want this boot method to be selected. If its a true error
199 # to pxeconfig the TFTPService will raise that error, as pxeconfig
200 # is called again in that service.
201 d.addErrback(lambda failure: None)
197 return d202 return d
198203
199 def clean_path(self, path):204 def clean_path(self, path):