openstack
/
tricircle
Code Issues Proposed changes

fresh cinder proxy 

Change-Id: I4d22e8261b06667f1f6abbd085e98a62a26ce375
This commit is contained in:
ChiZhang 2015-01-08 19:41:47 +08:00
parent 2ccb6a723c
commit 8796babed2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cinderproxy/cinder/volume/cinder_proxy.py
View File

@ -410,9 +410,6 @@ class CinderProxy(manager.SchedulerDependentManager):
LOG.info(_('cascade ino: create volume use volume type, '
'cascade name:%s'), cascaded_volume_type)
metadata = volume_properties.get('metadata', {})
metadata['logicalVolumeId'] = volume_id
cascaded_image_id = None
if image_id is not None:
if cfg.CONF.glance_cascading_flag:
@ -429,6 +426,9 @@ class CinderProxy(manager.SchedulerDependentManager):
LOG.info(_('cascade ino: create volume with available zone:%s'),
availability_zone)
metadata = volume_properties.get('metadata', {})
metadata['logicalVolumeId'] = volume_id
cinderClient = self._get_cinder_cascaded_user_client(context)
bodyResponse = cinderClient.volumes.create(
@ -447,6 +447,8 @@ class CinderProxy(manager.SchedulerDependentManager):
if bodyResponse._info['status'] == 'creating':
self.volumes_mapping_cache['volumes'][volume_id] = \
bodyResponse._info['id']
if 'logicalVolumeId' in metadata:
metadata.pop('logicalVolumeId')
metadata['mapping_uuid'] = bodyResponse._info['id']
self.db.volume_metadata_update(context, volume_id,
metadata, True)