Merge lp://staging/~andreserl/maas/lp1604962_lp1604987_2.0 into lp://staging/maas/2.0
Proposed by
Andres Rodriguez
| Status: | Merged |
|---|---|
| Approved by: | Andres Rodriguez |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 5174 |
| Proposed branch: | lp://staging/~andreserl/maas/lp1604962_lp1604987_2.0 |
| Merge into: | lp://staging/maas/2.0 |
| Diff against target: |
306 lines (+89/-40) 8 files modified
docs/changelog.rst (+4/-0) src/maasserver/models/node.py (+33/-20) src/maasserver/models/tests/test_node.py (+12/-3) src/maasserver/rpc/nodes.py (+1/-1) src/maasserver/status_monitor.py (+1/-1) src/metadataserver/api.py (+18/-12) src/metadataserver/tests/test_api_status.py (+5/-3) src/provisioningserver/events.py (+15/-0) |
| To merge this branch: | bzr merge lp://staging/~andreserl/maas/lp1604962_lp1604987_2.0 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Andres Rodriguez (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Fixes to correctly log cloud-init/curtin FAIL events in the node event log.
Fixes to correctly log "mark_failed" events. We did this by combining the mark_failed with _mark_failed functions, provided that the latter wasn't really storing anything in the event log and it should. It now differentiates between a user driven "Mark Failed" vs a system driven.
Drive-by fix to improve mark_failed function.
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
self approving as this has landed in trunk.