openstack
/
heat
Code Issues Proposed changes

Merge "Don't try to store i18n messages"

This commit is contained in:
Jenkins 2017-01-31 05:13:31 +00:00 committed by Gerrit Code Review
parent 7eff493cad 2b69e0e245
commit 896a52b200
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/engine/resource.py
View File

@ -1736,7 +1736,7 @@ class Resource(object):
try:
rs = {'action': self.action,
'status': self.status,
'status_reason': self.status_reason,
'status_reason': str(self.status_reason),
'stack_id': self.stack.id,
'physical_resource_id': self.resource_id,
'name': self.name,
@ -1777,7 +1777,7 @@ class Resource(object):
data = {
'action': self.action,
'status': self.status,
'status_reason': reason,
'status_reason': str(reason),
'stack_id': self.stack.id,
'updated_at': self.updated_time,
'needed_by': self.needed_by,

12
heat/engine/service.py
View File

@ -1041,11 +1041,13 @@ class EngineService(service.ServiceBase):
return api.format_stack_resource(current.resources.get(k))
return {
'unchanged': map(fmt_updated_res, act.get('unchanged', [])),
'updated': map(fmt_current_res, act.get('updated', [])),
'replaced': map(fmt_updated_res, act.get('replaced', [])),
'added': map(fmt_updated_res, act.get('added', [])),
'deleted': map(fmt_current_res, act.get('deleted', [])),
'unchanged': list(
map(fmt_updated_res, act.get('unchanged', []))),
'updated': list(map(fmt_current_res, act.get('updated', []))),
'replaced': list(
map(fmt_updated_res, act.get('replaced', []))),
'added': list(map(fmt_updated_res, act.get('added', []))),
'deleted': list(map(fmt_current_res, act.get('deleted', []))),
}
updated_stack.id = current_stack.id

4
heat/engine/service_software_config.py
View File

@ -256,7 +256,7 @@ class SoftwareConfigService(object):
'stack_user_project_id': stack_user_project_id,
'action': action,
'status': status,
'status_reason': status_reason})
'status_reason': str(status_reason)})
self._push_metadata_software_deployments(
cnxt, server_id, stack_user_project_id)
return api.format_software_deployment(sd)
@ -337,7 +337,7 @@ class SoftwareConfigService(object):
if status:
update_data['status'] = status
if status_reason:
update_data['status_reason'] = status_reason
update_data['status_reason'] = str(status_reason)
if updated_at:
update_data['updated_at'] = timeutils.normalize_time(
timeutils.parse_isotime(updated_at))

6
heat/engine/stack.py
View File

@ -607,7 +607,7 @@ class Stack(collections.Mapping):
stack.update({
'action': self.action,
'status': self.status,
'status_reason': self.status_reason})
'status_reason': str(self.status_reason)})
if only_db:
stack['parent_resource_name'] = self.parent_resource_name
@ -951,7 +951,7 @@ class Stack(collections.Mapping):
if stack is not None:
values = {'action': self.action,
'status': self.status,
'status_reason': self.status_reason}
'status_reason': str(self.status_reason)}
self._send_notification_and_add_event()
if self.convergence:
# do things differently for convergence
@ -983,7 +983,7 @@ class Stack(collections.Mapping):
if stack is not None:
values = {'action': self.action,
'status': self.status,
'status_reason': self.status_reason}
'status_reason': str(self.status_reason)}
self._send_notification_and_add_event()
stack.persist_state_and_release_lock(self.context, self.id,
engine_id, values)