Merge lp://staging/~julian-edwards/maas/enable_dhcp_when_setting_up_params into lp://staging/~maas-committers/maas/trunk
Proposed by
Julian Edwards
| Status: | Merged |
|---|---|
| Approved by: | Julian Edwards |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 969 |
| Proposed branch: | lp://staging/~julian-edwards/maas/enable_dhcp_when_setting_up_params |
| Merge into: | lp://staging/~maas-committers/maas/trunk |
| Diff against target: |
55 lines (+8/-20) 2 files modified
src/maasserver/management/commands/config_master_dhcp.py (+3/-3) src/maasserver/tests/test_commands_config_master_dhcp.py (+5/-17) |
| To merge this branch: | bzr merge lp://staging/~julian-edwards/maas/enable_dhcp_when_setting_up_params |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jeroen T. Vermeulen (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Implicitly enable DHCP management when using the command "maas config-master-dhcp" to set up the DHCP parameters.
This will cause the DHCPD config file to also get written, which is reasonable behaviour given that someone is calling a command to set up DHCP parameters.
To post a comment you must log in.
Revision history for this message
| Julian Edwards (julian-edwards) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Makes sense. One small thing: in that last test, it may help to disable manage_dhcp explicitly. If we ever decide to change the default, or there's another test isolation problem, it'll be good to know that the test isn't passing for the wrong reason.
Jeroen