From e86153020a95737938e8b798a695076dada5c6ef Mon Sep 17 00:00:00 2001 From: Shivanand Tendulker Date: Tue, 9 Jan 2018 06:56:27 -0500 Subject: [PATCH] Update 'Nova rescue/unrescue in Ironic' This updates the spec for outstanding comment for commit 82f79a54e08194cd14744a0c7913dcb58b16e50e. Update is made to make it explicit that only instance can be deleted when node is in RESCUEWAIT, RESCUE, UNRESCUEFAIL or RESCUEFAIL state. Change-Id: I7c140edb53ed0ffe678a101f84df3fa3a3690b00 --- specs/approved/implement-rescue-mode.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/specs/approved/implement-rescue-mode.rst b/specs/approved/implement-rescue-mode.rst index 53915f75..100900b2 100644 --- a/specs/approved/implement-rescue-mode.rst +++ b/specs/approved/implement-rescue-mode.rst @@ -36,9 +36,9 @@ Proposed change * Add AgentRescue driver (implements base.RescueInterface). This implementation will be available only through hardware type. It would not be supported in the classic drivers as they would be deprecated shortly. -* For classic drivers rescue interface would be set to 'no-rescue' which would - generate 'UnsupportedDriverExtension' exception when any methods of this - interface are invoked. +* For classic drivers rescue interface would be set to 'None'. An exception + of type 'UnsupportedDriverExtension' would be generated when any methods of + this interface are invoked for nodes managed by classic drivers. * Add periodic task _check_rescue_timeouts to fail the rescue process if it takes longer than rescue_callback_timeout seconds for the rescue ramdisk to come online. @@ -128,9 +128,9 @@ State Machine Impact * RESCUING -> RESCUEFAIL (rescue fails) * RESCUEWAIT -> RESCUING (callback succeeds) * RESCUEWAIT -> RESCUEFAIL (callback fails or abort issued) - * RESCUEWAIT -> DELETING (delete without waiting) + * RESCUEWAIT -> DELETING (delete instance without waiting) * RESCUE -> RESCUING (re-rescue node) - * RESCUE -> DELETING (delete rescued node) + * RESCUE -> DELETING (delete rescued instance) * RESCUE -> UNRESCUING (unrescue node) * UNRESCUING -> UNRESCUEFAIL (unrescue fails) * UNRESCUING -> ACTIVE (unrescue succeeds) @@ -139,7 +139,7 @@ State Machine Impact * UNRESCUEFAIL -> DELETING (delete instance that failed unrescuing) * RESCUEFAIL -> RESCUING (re-rescue after rescue failed) * RESCUEFAIL -> UNRESCUING (unrescue after failed rescue) - * RESCUEFAIL -> DELETING (delete after failed rescue) + * RESCUEFAIL -> DELETING (delete instance after failed rescue) * Add state machine verbs: