Merge lp:~jtv/maas/custom-dhcp into lp:~maas-committers/maas/trunk
Proposed by
Jeroen T. Vermeulen
Status: | Merged |
---|---|
Approved by: | Jeroen T. Vermeulen |
Approved revision: | no longer in the source branch. |
Merged at revision: | 1055 |
Proposed branch: | lp:~jtv/maas/custom-dhcp |
Merge into: | lp:~maas-committers/maas/trunk |
Diff against target: |
189 lines (+53/-19) 6 files modified
HACKING.txt (+17/-8) etc/celeryconfig.py (+5/-2) src/maasserver/models/nodegroup.py (+6/-1) src/maasserver/tests/test_nodegroup.py (+4/-0) src/provisioningserver/tasks.py (+9/-5) src/provisioningserver/tests/test_tasks.py (+12/-3) |
To merge this branch: | bzr merge lp:~jtv/maas/custom-dhcp |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
John A Meinel (community) | Approve | ||
Review via email: mp+124671@code.launchpad.net |
Commit message
Use our own dhcpd instance, so we can tell it which network interfaces to service.
This must be accompanied by a matching packaging change which installs the maas-dhcp-server Upstart script as part of maas-dhcp.
As a drive-by, I added the “-n” option to a sudo command. Makes sudo fail if it would need to prompt for a password.
Description of the change
The “sudo -n” was Raphaël's suggestion. The accompanying packaging branch is at https:/
Jeroen
To post a comment you must log in.
Would it make sense to gather up all the files that need to be written under sudo and do them with one call rather than several? Do we get a decent error message up to users if sudo fails because of '-n' (or just a stacktrace in python because the command failed?)
Otherwise looks fine to me.