openstack
/
ironic
Code Issues Proposed changes

Merge "Follow up to inspect wait implementation"

This commit is contained in:
Zuul 2018-05-10 15:35:56 +00:00 committed by Gerrit Code Review
parent 9e63f0e97f 1a59ef96fc
commit 75dfafcf57
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ironic/common/states.py
View File

@ -216,6 +216,8 @@ UNRESCUEFAIL = 'unrescue failed'
UNRESCUING = 'unrescuing'
""" Node is being restored from rescue mode (to active state). """
# NOTE(kaifeng): INSPECTING is allowed to keep backwards compatibility,
# starting from API 1.39 node update is disallowed in this state.
UPDATE_ALLOWED_STATES = (DEPLOYFAIL, INSPECTING, INSPECTFAIL, INSPECTWAIT,
CLEANFAIL, ERROR, VERIFYING, ADOPTFAIL, RESCUEFAIL,
UNRESCUEFAIL)

3
ironic/conductor/manager.py
View File

@ -170,6 +170,9 @@ class ConductorManager(base_manager.BaseConductorManager):
# TODO(dtantsur): reconsider allowing changing some (but not all)
# interfaces for active nodes in the future.
# NOTE(kaifeng): INSPECTING is allowed to keep backwards
# compatibility, starting from API 1.39 node update is disallowed
# in this state.
allowed_update_states = [states.ENROLL, states.INSPECTING,
states.INSPECTWAIT, states.MANAGEABLE,
states.AVAILABLE]