Merge lp:~rvb/maas/fixture-error into lp:maas/trunk
Proposed by
Raphaël Badin
on 2012-10-17
| Status: | Merged |
|---|---|
| Approved by: | Raphaël Badin on 2012-10-17 |
| Approved revision: | 1282 |
| Merged at revision: | 1282 |
| Proposed branch: | lp:~rvb/maas/fixture-error |
| Merge into: | lp:maas/trunk |
| Diff against target: |
47 lines (+5/-5) 1 file modified
src/maasserver/fixtures/dev_fixture.yaml (+5/-5) |
| To merge this branch: | bzr merge lp:~rvb/maas/fixture-error |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Packman (community) | 2012-10-17 | Approve on 2012-10-17 | |
|
Review via email:
|
|||
Commit Message
Fix the dev fixture so that nodes have a null value for nodegroup.
Description of the Change
This branch fixes the dev fixture: we can no longer rely on the fact that the master nodegroup exists when the dev fixture is loaded (we removed the call to the [now gone] command config_dhcp_master recently because right now, all the DHCP config is done via the API/CLI/UI). This change sets the nodegroup of the nodes to null so that when the application is started, the call to start_up will in turn call ensure_master which will: create a master nodegroup and attache the existing nodes to that nodegroup (that behavior is part of the upgrade story).
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Tested here and this fixes `make sampledata`. One minor difference from the old way, as discussed on IRC, is that the nodegroup relationship is not populated until maasserver gets run. As the sampledata is for live testing, this seems fine.