From f2c5ee22610d13e00a1f1f54e8764009f4801c3f Mon Sep 17 00:00:00 2001 From: Chris Friesen Date: Mon, 15 May 2017 12:48:37 -0600 Subject: [PATCH] fix InvalidSharedStorage exception message The exception message for InvalidSharedStorage is grammatically complex and ignores the possibility of block migration, which results in a misleading and confusing message for the user. Change it to something simpler and more accurate. Change-Id: Icfc8e151a4ea36ec303f0b8c2e1dc9e6f0bd5925 Closes-Bug: #1690890 (cherry picked from commit 902b7bf6f5425824a0661b8e4beac4a894749c03) --- nova/virt/libvirt/driver.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 0e8fe0702c..068c51318e 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -5784,10 +5784,8 @@ class LibvirtDriver(driver.ComputeDriver): raise exception.MigrationPreCheckError(reason=msg) elif not (dest_check_data.is_shared_block_storage or dest_check_data.is_shared_instance_path): - reason = _("Live migration can not be used " - "without shared storage except " - "a booted from volume VM which " - "does not have a local disk.") + reason = _("Shared storage live-migration requires either shared " + "storage or boot-from-volume with no local disks.") raise exception.InvalidSharedStorage(reason=reason, path=source) # NOTE(mikal): include the instance directory name here because it -- 2.39.5