openstack/cinder
Code Issues Proposed changes

Merge "Fix incorrect status for volume clone from image"

Browse Source
This commit is contained in:
Jenkins 2013-05-30 16:53:21 +00:00 committed by Gerrit Code Review
commit 76062be494
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cinder/volume/manager.py
View File

@ -296,23 +296,22 @@ class VolumeManager(manager.SchedulerDependentManager):
volume_ref['id'], volume_ref['id'],
snapshot_id) snapshot_id)
if image_id and not cloned: if image_id and image_meta:
if image_meta: # Copy all of the Glance image properties to the
# Copy all of the Glance image properties to the # volume_glance_metadata table for future reference.
# volume_glance_metadata table for future reference. self.db.volume_glance_metadata_create(context,
volume_ref['id'],
'image_id', image_id)
name = image_meta.get('name', None)
if name:
self.db.volume_glance_metadata_create(context, self.db.volume_glance_metadata_create(context,
volume_ref['id'], volume_ref['id'],
'image_id', image_id) 'image_name', name)
name = image_meta.get('name', None) image_properties = image_meta.get('properties', {})
if name: for key, value in image_properties.items():
self.db.volume_glance_metadata_create(context, self.db.volume_glance_metadata_create(context,
volume_ref['id'], volume_ref['id'],
'image_name', name) key, value)
image_properties = image_meta.get('properties', {})
for key, value in image_properties.items():
self.db.volume_glance_metadata_create(context,
volume_ref['id'],
key, value)
now = timeutils.utcnow() now = timeutils.utcnow()
self.db.volume_update(context, self.db.volume_update(context,