diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-05-29 15:21:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-05-29 15:21:00 +0000 |
| commit | d467dafd7b969267cc884f7e7175ee8f724a32d2 (patch) | |
| tree | 2839e5ba7d514bfda5d831d69e41a2febfae6f4f | |
| parent | 8d612153f7c7cfe2a188d2af173c6c8be17d6c35 (diff) | |
| parent | 832a66cf0bd8f7ccb0878889174c1ce4da7f42f3 (diff) | |
| download | nova-d467dafd7b969267cc884f7e7175ee8f724a32d2.tar.gz nova-d467dafd7b969267cc884f7e7175ee8f724a32d2.tar.xz nova-d467dafd7b969267cc884f7e7175ee8f724a32d2.zip | |
Merge "Using unicode() to handle image's properties"
| -rw-r--r-- | nova/compute/api.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 32a68280d..378269a04 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -932,7 +932,7 @@ class API(base.Base): instance.setdefault('system_metadata', {}) prefix_format = SM_IMAGE_PROP_PREFIX + '%s' for key, value in image_properties.iteritems(): - new_value = str(value)[:255] + new_value = unicode(value)[:255] instance['system_metadata'][prefix_format % key] = new_value # Keep a record of the original base image that this @@ -1835,7 +1835,7 @@ class API(base.Base): del sys_metadata[key] # Add the new ones for key, value in image.get('properties', {}).iteritems(): - new_value = str(value)[:255] + new_value = unicode(value)[:255] sys_metadata[(SM_IMAGE_PROP_PREFIX + '%s') % key] = new_value self.db.instance_system_metadata_update(context, instance['uuid'], sys_metadata, True) |