MAAS

Merge lp:~julian-edwards/maas/allow-failed-commissioning-to-be-marked-broken into lp:~maas-committers/maas/trunk

  1. allow-failed-commissioning-to-be-marked-broken
  2. Merge into trunk
Proposed by Julian Edwards
Status: Merged
Approved by: Julian Edwards
Approved revision: no longer in the source branch.
Merged at revision: 2970
Proposed branch: lp:~julian-edwards/maas/allow-failed-commissioning-to-be-marked-broken
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 13 lines (+2/-1)
1 file modified
src/maasserver/node_action.py (+2/-1)
To merge this branch: bzr merge lp:~julian-edwards/maas/allow-failed-commissioning-to-be-marked-broken
Reviewer Review Type Date Requested Status
Julian Edwards (community) trivial Approve
Review via email: mp+234412@code.launchpad.net

Commit message

Allow nodes that failed commissioning to be marked as broken.

To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) :
review: Approve (trivial)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/maasserver/node_action.py'
--- src/maasserver/node_action.py 2014-08-21 19:35:44 +0000
+++ src/maasserver/node_action.py 2014-09-12 03:21:30 +0000
@@ -334,7 +334,8 @@
334 display_bulk = "Mark selected nodes as broken"334 display_bulk = "Mark selected nodes as broken"
335 actionable_statuses = (335 actionable_statuses = (
336 NODE_STATUS.NEW, NODE_STATUS.COMMISSIONING,336 NODE_STATUS.NEW, NODE_STATUS.COMMISSIONING,
337 NODE_STATUS.ALLOCATED, NODE_STATUS.FAILED_DEPLOYMENT)337 NODE_STATUS.ALLOCATED, NODE_STATUS.FAILED_DEPLOYMENT,
338 NODE_STATUS.FAILED_COMMISSIONING)
338 permission = NODE_PERMISSION.EDIT339 permission = NODE_PERMISSION.EDIT
339340
340 def execute(self, allow_redirect=True):341 def execute(self, allow_redirect=True):