diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-01 02:41:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-01 02:41:20 +0000 |
| commit | b54e200d195b62e0b80f66706dfb7939ce452bdf (patch) | |
| tree | b63c477e95d66e1e54531e34448c81aea491b459 | |
| parent | 138fafbb81b9759078b5d7175b9f33b3c320c7bc (diff) | |
| parent | 45b9769212a7cdf61e44158395f3b97353feb7c0 (diff) | |
| download | heat-b54e200d195b62e0b80f66706dfb7939ce452bdf.tar.gz | |
Merge "Use six.text_type() instead of str() to serialise status" into stable/ocata
| -rw-r--r-- | heat/engine/resource.py | 2 | ||||
| -rw-r--r-- | heat/engine/service_software_config.py | 4 | ||||
| -rw-r--r-- | heat/engine/stack.py | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/heat/engine/resource.py b/heat/engine/resource.py index 70bc2be00..6d68f2861 100644 --- a/heat/engine/resource.py +++ b/heat/engine/resource.py @@ -1745,7 +1745,7 @@ class Resource(object): rs = {'action': self.action, 'status': self.status, - 'status_reason': str(self.status_reason), + 'status_reason': six.text_type(self.status_reason), 'stack_id': self.stack.id, 'physical_resource_id': self.resource_id, 'name': self.name, diff --git a/heat/engine/service_software_config.py b/heat/engine/service_software_config.py index 5ea48fb6c..6e07ffdf0 100644 --- a/heat/engine/service_software_config.py +++ b/heat/engine/service_software_config.py @@ -257,7 +257,7 @@ class SoftwareConfigService(object): 'stack_user_project_id': stack_user_project_id, 'action': action, 'status': status, - 'status_reason': str(status_reason)}) + 'status_reason': six.text_type(status_reason)}) self._push_metadata_software_deployments( cnxt, server_id, stack_user_project_id) return api.format_software_deployment(sd) @@ -338,7 +338,7 @@ class SoftwareConfigService(object): if status: update_data['status'] = status if status_reason: - update_data['status_reason'] = str(status_reason) + update_data['status_reason'] = six.text_type(status_reason) if updated_at: update_data['updated_at'] = timeutils.normalize_time( timeutils.parse_isotime(updated_at)) diff --git a/heat/engine/stack.py b/heat/engine/stack.py index 9a58bcf66..48fcda382 100644 --- a/heat/engine/stack.py +++ b/heat/engine/stack.py @@ -606,7 +606,7 @@ class Stack(collections.Mapping): stack.update({ 'action': self.action, 'status': self.status, - 'status_reason': str(self.status_reason)}) + 'status_reason': six.text_type(self.status_reason)}) if only_db: stack['parent_resource_name'] = self.parent_resource_name @@ -949,7 +949,7 @@ class Stack(collections.Mapping): if stack is not None: values = {'action': self.action, 'status': self.status, - 'status_reason': str(self.status_reason)} + 'status_reason': six.text_type(self.status_reason)} self._send_notification_and_add_event() if self.convergence: # do things differently for convergence @@ -981,7 +981,7 @@ class Stack(collections.Mapping): if stack is not None: values = {'action': self.action, 'status': self.status, - 'status_reason': str(self.status_reason)} + 'status_reason': six.text_type(self.status_reason)} self._send_notification_and_add_event() stack.persist_state_and_release_lock(self.context, self.id, engine_id, values) |