Merge lp:~racb/maas/fix-ipmi-enlistment into lp:~maas-committers/maas/trunk
Proposed by
Robie Basak
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Robie Basak | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 1256 | ||||
Proposed branch: | lp:~racb/maas/fix-ipmi-enlistment | ||||
Merge into: | lp:~maas-committers/maas/trunk | ||||
Diff against target: |
15 lines (+4/-1) 1 file modified
contrib/preseeds_v2/enlist_userdata (+4/-1) |
||||
To merge this branch: | bzr merge lp:~racb/maas/fix-ipmi-enlistment | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Julian Edwards (community) | Approve | ||
Andres Rodriguez | Pending | ||
Review via email: mp+128914@code.launchpad.net |
Commit message
Retry maas-enlist without power parameters on failure
Older versions of maas-enlist (such as in Precise) do not support the
new power parameters switches and fail when they are provided, so on
failure retry without them.
Description of the change
This fixes the problem for me. A better way would be to do some proper feature or version checking in maas-enlist, but this would introduce more chance of a regression and we are time constrained right now. This also spams the console, but at least it is clear when the fallback has taken place.
To post a comment you must log in.
Is there any chance you can make it more obvious that the second invocation is conditional on the first? It's pretty easy to misread given that the first line is very long and ends with the critical "||\" characters. Perhaps indent the second maas-enlist line?
Looks ok otherwise.