Merge "fix InvalidSharedStorage exception message" into stable/ocata

This commit is contained in:
Jenkins 2017-06-13 17:32:45 +00:00 committed by Gerrit Code Review
commit 371a97c89a
1 changed files with 2 additions and 4 deletions

View File

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