Merge "Fix: modify rollback software rule for deployment"
This commit is contained in:
commit
795288a1f9
@ -568,8 +568,6 @@ class DeployRollbackSoftware(tables.Action):
|
|||||||
verbose_name = _("Rollback Software")
|
verbose_name = _("Rollback Software")
|
||||||
|
|
||||||
def allowed(self, request, host=None):
|
def allowed(self, request, host=None):
|
||||||
if host is None:
|
|
||||||
return True
|
|
||||||
|
|
||||||
valid_states = {
|
valid_states = {
|
||||||
"rollback-deploying",
|
"rollback-deploying",
|
||||||
@ -579,6 +577,9 @@ class DeployRollbackSoftware(tables.Action):
|
|||||||
release_on = stx_api.usm.deploy_show_req(request)
|
release_on = stx_api.usm.deploy_show_req(request)
|
||||||
deploy_host = stx_api.usm.get_deploy_host(request, host.hostname)
|
deploy_host = stx_api.usm.get_deploy_host(request, host.hostname)
|
||||||
|
|
||||||
|
if host is None:
|
||||||
|
return True
|
||||||
|
|
||||||
if deploy_host is None or release_on is None or len(release_on) == 0:
|
if deploy_host is None or release_on is None or len(release_on) == 0:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
@ -588,8 +589,7 @@ class DeployRollbackSoftware(tables.Action):
|
|||||||
release_on[0]['state'] == 'host-rollback'
|
release_on[0]['state'] == 'host-rollback'
|
||||||
)
|
)
|
||||||
|
|
||||||
return (host_locked(host) and is_valid_host_state and
|
return is_valid_host_state and is_valid_release_state
|
||||||
is_valid_release_state)
|
|
||||||
|
|
||||||
def single(self, table, request, host_id):
|
def single(self, table, request, host_id):
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user