summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-13 17:32:45 +0000
committerGerrit Code Review <review@openstack.org>2017-06-13 17:32:46 +0000
commit371a97c89ae59981fe3bd65fc89b08bb4d256f8e (patch)
treeb46dd42676a35e64b65a59f7de494aa5ac9227e9
parent34d05289c8e43e660a41d5e455887ee7c352fca7 (diff)
parentf2c5ee22610d13e00a1f1f54e8764009f4801c3f (diff)
Merge "fix InvalidSharedStorage exception message" into stable/ocata
-rw-r--r--nova/virt/libvirt/driver.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index 88fea16..f0c1a22 100644
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -5800,10 +5800,8 @@ class LibvirtDriver(driver.ComputeDriver):
5800 raise exception.MigrationPreCheckError(reason=msg) 5800 raise exception.MigrationPreCheckError(reason=msg)
5801 elif not (dest_check_data.is_shared_block_storage or 5801 elif not (dest_check_data.is_shared_block_storage or
5802 dest_check_data.is_shared_instance_path): 5802 dest_check_data.is_shared_instance_path):
5803 reason = _("Live migration can not be used " 5803 reason = _("Shared storage live-migration requires either shared "
5804 "without shared storage except " 5804 "storage or boot-from-volume with no local disks.")
5805 "a booted from volume VM which "
5806 "does not have a local disk.")
5807 raise exception.InvalidSharedStorage(reason=reason, path=source) 5805 raise exception.InvalidSharedStorage(reason=reason, path=source)
5808 5806
5809 # NOTE(mikal): include the instance directory name here because it 5807 # NOTE(mikal): include the instance directory name here because it