openstack
/
cinder
Code Issues Proposed changes

Merge "Update rbd warning message"

This commit is contained in:
Zuul 2021-11-02 01:34:15 +00:00 committed by Gerrit Code Review
parent 48edd1dd9d b7e2945990
commit aafaba0e95
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2851,7 +2851,7 @@ class RBDTestCase(test.TestCase):
'secret,id=luks_sec,format=raw,file=/passfile',
'-o', 'key-secret=luks_sec', '/imgfile', '12288M')
mock_exec.assert_any_call(
'rbd', 'import', '--pool', 'rbd', '--order', 22,
'rbd', 'import', '--dest-pool', 'rbd', '--order', 22,
'/imgfile', self.volume_c.name)
@mock.patch('cinder.objects.Volume.get_by_id')

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

@ -958,7 +958,7 @@ class RBDDriver(driver.CloneableImageVD, driver.MigrateVD,
order = int(math.log(chunk_size, 2))
cmd = ['rbd', 'import',
'--pool', self.configuration.rbd_pool,
'--dest-pool', self.configuration.rbd_pool,
'--order', order,
tmp_image.name, volume.name]
cmd.extend(self._ceph_args())