openstack
/
cinder
Code Issues Proposed changes

Merge "Add ability for ceph driver to report discard"

This commit is contained in:
Jenkins 2017-05-10 11:35:35 +00:00 committed by Gerrit Code Review
parent 1c8d366699 bea5437ecb
commit 53e1bb3525
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cinder/tests/unit/volume/drivers/test_rbd.py
View File

@ -1169,7 +1169,8 @@ class RBDTestCase(test.TestCase):
'auth_username': self.cfg.rbd_user, 'auth_username': self.cfg.rbd_user,
'secret_type': 'ceph', 'secret_type': 'ceph',
'secret_uuid': None, 'secret_uuid': None,
'volume_id': self.volume_a.id 'volume_id': self.volume_a.id,
'discard': True,
} }
} }
actual = self.driver.initialize_connection(self.volume_a, None) actual = self.driver.initialize_connection(self.volume_a, None)

1
cinder/volume/drivers/rbd.py
View File

@ -1035,6 +1035,7 @@ class RBDDriver(driver.CloneableImageVD,
'secret_type': 'ceph', 'secret_type': 'ceph',
'secret_uuid': self.configuration.rbd_secret_uuid, 'secret_uuid': self.configuration.rbd_secret_uuid,
'volume_id': volume.id, 'volume_id': volume.id,
"discard": True,
} }
} }
LOG.debug('connection data: %s', data) LOG.debug('connection data: %s', data)