openstack
/
cinder
Code Issues Proposed changes

Merge "Remove name_id when creating volume with cache enabled"

This commit is contained in:
Jenkins 2016-01-06 04:11:24 +00:00 committed by Gerrit Code Review
parent 6ca5d45562 864cd83c5a
commit 0b0b59109d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/volume/manager.py
View File

@ -1079,11 +1079,11 @@ class VolumeManager(manager.SchedulerDependentManager):
reserve_opts = {'volumes': 1, 'gigabytes': volume.size}
QUOTAS.add_volume_type_opts(ctx, reserve_opts, volume_type_id)
reservations = QUOTAS.reserve(ctx, **reserve_opts)
try:
new_vol_values = dict(volume.items())
new_vol_values.pop('id', None)
new_vol_values.pop('_name_id', None)
new_vol_values.pop('name_id', None)
new_vol_values.pop('volume_type', None)
new_vol_values.pop('name', None)
@ -1128,7 +1128,7 @@ class VolumeManager(manager.SchedulerDependentManager):
{'volume_id': volume.id,
'image_id': image_meta['id']})
try:
self.delete_volume(ctx, image_volume)
self.delete_volume(ctx, image_volume.id)
except exception.CinderException:
LOG.exception(_LE('Could not delete the image volume %(id)s.'),
{'id': volume.id})