openstack/ironic-ui
Code Issues Proposed changes

Merge "Add support for aborting node cleaning"

Browse Source
This commit is contained in:
Jenkins 2017-01-27 14:46:57 +00:00 committed by Gerrit Code Review
commit 302a27a993
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ironic_ui/api/ironic.py
View File

@ -23,7 +23,7 @@ from horizon.utils.memoized import memoized # noqa
from openstack_dashboard.api import base from openstack_dashboard.api import base
DEFAULT_IRONIC_API_VERSION = '1.11' DEFAULT_IRONIC_API_VERSION = '1.13'
DEFAULT_INSECURE = False DEFAULT_INSECURE = False
DEFAULT_CACERT = None DEFAULT_CACERT = None

4
ironic_ui/static/dashboard/admin/ironic/node-state-transition.service.js
View File

@ -67,6 +67,10 @@
states['inspect failed'].addTransition('manageable', 'manage'); states['inspect failed'].addTransition('manageable', 'manage');
states['clean wait'].addTransition('clean failed',
'abort',
gettext('Abort cleaning'));
states['clean failed'].addTransition('manageable', 'manage'); states['clean failed'].addTransition('manageable', 'manage');
states['deploy failed'].addTransition('active', 'active'); states['deploy failed'].addTransition('active', 'active');