openstack
/
glance_store
Code Issues Proposed changes

Merge "Cinder driver: TypeError in _open_cinder_volume"

This commit is contained in:
Jenkins 2017-07-18 19:18:35 +00:00 committed by Gerrit Code Review
parent da94b56f9e 0c5b04a59c
commit dc650c069b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
glance_store/_drivers/cinder.py
View File

@ -497,10 +497,13 @@ class Store(glance_store.driver.Store):
device = conn.connect_volume(connection_info['data'])
volume.attach(None, None, attach_mode, host_name=host)
volume = self._wait_volume_status(volume, 'attaching', 'in-use')
LOG.debug('Opening host device "%s"', device['path'])
with temporary_chown(device['path']), \
open(device['path'], mode) as f:
yield f
if (connection_info['driver_volume_type'] == 'rbd' and
not conn.do_local_attach):
yield device['path']
else:
with temporary_chown(device['path']), \
open(device['path'], mode) as f:
yield f
except Exception:
LOG.exception(_LE('Exception while accessing to cinder volume '
'%(volume_id)s.'), {'volume_id': volume.id})