fresh cinder proxy
Change-Id: I4d22e8261b06667f1f6abbd085e98a62a26ce375
This commit is contained in:
parent
2ccb6a723c
commit
8796babed2
|
@ -410,9 +410,6 @@ class CinderProxy(manager.SchedulerDependentManager):
|
||||||
LOG.info(_('cascade ino: create volume use volume type, '
|
LOG.info(_('cascade ino: create volume use volume type, '
|
||||||
'cascade name:%s'), cascaded_volume_type)
|
'cascade name:%s'), cascaded_volume_type)
|
||||||
|
|
||||||
metadata = volume_properties.get('metadata', {})
|
|
||||||
metadata['logicalVolumeId'] = volume_id
|
|
||||||
|
|
||||||
cascaded_image_id = None
|
cascaded_image_id = None
|
||||||
if image_id is not None:
|
if image_id is not None:
|
||||||
if cfg.CONF.glance_cascading_flag:
|
if cfg.CONF.glance_cascading_flag:
|
||||||
|
@ -429,6 +426,9 @@ class CinderProxy(manager.SchedulerDependentManager):
|
||||||
LOG.info(_('cascade ino: create volume with available zone:%s'),
|
LOG.info(_('cascade ino: create volume with available zone:%s'),
|
||||||
availability_zone)
|
availability_zone)
|
||||||
|
|
||||||
|
metadata = volume_properties.get('metadata', {})
|
||||||
|
metadata['logicalVolumeId'] = volume_id
|
||||||
|
|
||||||
cinderClient = self._get_cinder_cascaded_user_client(context)
|
cinderClient = self._get_cinder_cascaded_user_client(context)
|
||||||
|
|
||||||
bodyResponse = cinderClient.volumes.create(
|
bodyResponse = cinderClient.volumes.create(
|
||||||
|
@ -447,6 +447,8 @@ class CinderProxy(manager.SchedulerDependentManager):
|
||||||
if bodyResponse._info['status'] == 'creating':
|
if bodyResponse._info['status'] == 'creating':
|
||||||
self.volumes_mapping_cache['volumes'][volume_id] = \
|
self.volumes_mapping_cache['volumes'][volume_id] = \
|
||||||
bodyResponse._info['id']
|
bodyResponse._info['id']
|
||||||
|
if 'logicalVolumeId' in metadata:
|
||||||
|
metadata.pop('logicalVolumeId')
|
||||||
metadata['mapping_uuid'] = bodyResponse._info['id']
|
metadata['mapping_uuid'] = bodyResponse._info['id']
|
||||||
self.db.volume_metadata_update(context, volume_id,
|
self.db.volume_metadata_update(context, volume_id,
|
||||||
metadata, True)
|
metadata, True)
|
||||||
|
|
Loading…
Reference in New Issue