From ff7c04b103573cd301e8df18f9391811c0e8b8d3 Mon Sep 17 00:00:00 2001 From: Peter Piela Date: Mon, 9 Jan 2017 10:52:10 -0500 Subject: [PATCH] Add support for aborting node cleaning Added support for issuing an abort action to a node in clean-wait state. Change-Id: Ia2a7cce670bc4ee2a3febb86d6138386008cfd2a Closes-Bug: 1648557 --- ironic_ui/api/ironic.py | 2 +- .../dashboard/admin/ironic/node-state-transition.service.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ironic_ui/api/ironic.py b/ironic_ui/api/ironic.py index 811ab7ce..8843f8c7 100755 --- a/ironic_ui/api/ironic.py +++ b/ironic_ui/api/ironic.py @@ -23,7 +23,7 @@ from horizon.utils.memoized import memoized # noqa from openstack_dashboard.api import base -DEFAULT_IRONIC_API_VERSION = '1.11' +DEFAULT_IRONIC_API_VERSION = '1.13' DEFAULT_INSECURE = False DEFAULT_CACERT = None diff --git a/ironic_ui/static/dashboard/admin/ironic/node-state-transition.service.js b/ironic_ui/static/dashboard/admin/ironic/node-state-transition.service.js index 28d853fb..d7b246a9 100644 --- a/ironic_ui/static/dashboard/admin/ironic/node-state-transition.service.js +++ b/ironic_ui/static/dashboard/admin/ironic/node-state-transition.service.js @@ -67,6 +67,10 @@ states['inspect failed'].addTransition('manageable', 'manage'); + states['clean wait'].addTransition('clean failed', + 'abort', + gettext('Abort cleaning')); + states['clean failed'].addTransition('manageable', 'manage'); states['deploy failed'].addTransition('active', 'active');