Browse Source

Merge "Revert "nova shared storage: rbd is always shared storage"" into stable/queens

changes/13/730313/2
Zuul 1 month ago
committed by Gerrit Code Review
parent
commit
bea91b8d58
2 changed files with 0 additions and 5 deletions
  1. +0
    -1
      nova/tests/unit/virt/libvirt/test_driver.py
  2. +0
    -4
      nova/virt/libvirt/driver.py

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

@@ -8978,7 +8978,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')


+ 0
- 4
nova/virt/libvirt/driver.py View File

@@ -8112,10 +8112,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'


Loading…
Cancel
Save