openstack/trove
Code Issues Proposed changes

Merge "Fix error case where server.fault is missing"

Browse Source
This commit is contained in:
Jenkins 2016-11-18 21:02:18 +00:00 committed by Gerrit Code Review
commit 681a9830e0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
trove/taskmanager/models.py
View File

@ -633,10 +633,12 @@ class FreshInstanceTasks(FreshInstance, NotifyMixin, ConfigurationMixin):
server_status = server.status
if server_status in [InstanceStatus.ERROR,
InstanceStatus.FAILED]:
server_message = ''
if server.fault:
server_message = "\nServer error: %s" % (
server.fault.get('message', 'Unknown'))
server_fault_message = 'No fault found'
try:
server_fault_message = server.fault.get('message', 'Unknown')
except AttributeError:
pass
server_message = "\nServer error: %s" % server_fault_message
raise TroveError(_("Server not active, status: %(status)s"
"%(srv_msg)s") %
{'status': server_status,