openstack/trove
Code Issues Proposed changes

Merge "Fix status message inside validate_can_perform_action()"

Browse Source
This commit is contained in:
Zuul
2017-12-20 07:41:07 +00:00
committed by Gerrit Code Review
parent ccb6752f69 8c4605c3c7
commit 10a9a3194f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
trove/instance/models.py
View File

@@ -1261,7 +1261,7 @@ class Instance(BuiltInstance):
elif (self.db_info.task_status != InstanceTasks.NONE and
self.db_info.task_status != InstanceTasks.RESTART_REQUIRED):
status_type = 'task'
status = self.db_info.task_status
status = self.db_info.task_status.action
elif not self.datastore_status.status.action_is_allowed:
status = self.status
elif Backup.running(self.id):