Merge "Fixes bug 1045777."

This commit is contained in:
Jenkins
2012-09-12 23:48:50 +00:00
committed by Gerrit Code Review

View File

@@ -117,11 +117,6 @@ class VolumeManager(base.ManagerWithFind):
:param imageRef: reference to an image stored in glance
"""
if volume_type is None:
volume_type_id = None
else:
volume_type_id = volume_type.get('id', None)
if metadata is None:
volume_metadata = {}
else:
@@ -131,7 +126,7 @@ class VolumeManager(base.ManagerWithFind):
'snapshot_id': snapshot_id,
'display_name': display_name,
'display_description': display_description,
'volume_type_id': volume_type_id,
'volume_type': volume_type,
'user_id': user_id,
'project_id': project_id,
'availability_zone': availability_zone,