openstack/nova
Code Issues Proposed changes

Merge "Revert "nova shared storage: rbd is always shared storage""

Browse Source
This commit is contained in:
Zuul 2020-02-06 03:00:27 +00:00 committed by Gerrit Code Review
commit 2d7871792e
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nova/tests/unit/virt/libvirt/test_driver.py
View File

@ -10593,7 +10593,6 @@ class LibvirtConnTestCase(test.NoDBTestCase,
self.assertTrue(drvr._is_shared_block_storage(instance, data,
block_device_info=bdi))
self.assertEqual(0, mock_get_instance_disk_info.call_count)
self.assertTrue(drvr._is_storage_shared_with('foo', 'bar'))
def test_is_shared_block_storage_lvm(self):
self.flags(images_type='lvm', group='libvirt')

4
nova/virt/libvirt/driver.py
View File

@ -9597,10 +9597,6 @@ class LibvirtDriver(driver.ComputeDriver):
# on the same filesystem: the source and dest IP are the
# same, or we create a file on the dest system via SSH
# and check whether the source system can also see it.
# NOTE (drwahl): Actually, there is a 3rd way: if images_type is rbd,
# it will always be shared storage
if CONF.libvirt.images_type == 'rbd':
return True
shared_storage = (dest == self.get_host_ip_addr())
if not shared_storage:
tmp_file = uuidutils.generate_uuid(dashed=False) + '.tmp'