diff options
| author | hutianhao27 <hu.tianhao@99cloud.net> | 2019-09-17 01:56:56 +0000 |
|---|---|---|
| committer | Lee Yarwood <lyarwood@redhat.com> | 2020-05-11 15:17:53 +0100 |
| commit | 8ba6d8e9c043cc2682d5bb577c8dc3e49614d15f (patch) | |
| tree | eee55d86d4db0f08a629343ff1cc0a7c3a241484 /nova/virt | |
| parent | f50bd6e65758c7c3f3b433a1e66bd8c94f6947f8 (diff) | |
| download | nova-8ba6d8e9c043cc2682d5bb577c8dc3e49614d15f.tar.gz | |
Revert "nova shared storage: rbd is always shared storage"
This reverts commit 05b7f63a42e3512da6fe45d2e6639fb47ed8102b.
The _is_storage_shared_with method is specifically checking if the
instance directory is shared. It is not checking if the actual instance
disks are shared and as a result assumptions cannot be made based on the
value of images_type.
Closes-Bug: 1824858
Change-Id: I52293b6ce3e1ce77fa31b382d0067fb3bc68b21f
(cherry picked from commit 404932f82130445472837095b3ad9089c75e2660)
(cherry picked from commit 890882ebbf74db14a7c1904cca96cd7f5907493b)
(cherry picked from commit a63c97fd2d13de532330523587894163e32a892f)
(cherry picked from commit 44609c5847dfe591caf3f40497f1abc7c7aa7384)
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/libvirt/driver.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 65aacf190e..0a7582a772 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -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' |