diff options
| author | Dan Prince <dan.prince@rackspace.com> | 2011-03-25 10:07:42 -0400 |
|---|---|---|
| committer | Dan Prince <dan.prince@rackspace.com> | 2011-03-25 10:07:42 -0400 |
| commit | 51e8841b7cd818e5a3e0fa6bf023561b0160717d (patch) | |
| tree | 5072eedc101deab7d6df5b21403a4ceada1f51f2 /nova | |
| parent | f533c441c0062d05c7c361208016e56ca8f5e9df (diff) | |
Use metadata = image.get('properties', {}).
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/api/openstack/image_metadata.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/nova/api/openstack/image_metadata.py b/nova/api/openstack/image_metadata.py index e09952967..c9d6ac532 100644 --- a/nova/api/openstack/image_metadata.py +++ b/nova/api/openstack/image_metadata.py @@ -36,9 +36,7 @@ class Controller(wsgi.Controller): def _get_metadata(self, context, image_id, image=None): if not image: image = self.image_service.show(context, image_id) - metadata = {} - if 'properties' in image: - metadata = image['properties'] + metadata = image.get('properties', {}) return metadata def index(self, req, image_id): |