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 902b7bf6f5)
This commit is contained in:
Chris Friesen 2017-05-15 12:48:37 -06:00 committed by Lee Yarwood
parent 506465a027
commit f2c5ee2261
1 changed files with 2 additions and 4 deletions

View File

@ -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