diff options
| author | Jian Wen <wenjianhn@gmail.com> | 2012-08-29 22:29:25 +0800 |
|---|---|---|
| committer | Jian Wen <wenjianhn@gmail.com> | 2012-08-29 22:37:25 +0800 |
| commit | f94391fb41b42909ae9508ed54316199fccfe41d (patch) | |
| tree | 5535c2b2aad6f1b2774fea2b9e443f8b697e3684 /nova/virt | |
| parent | 20c6bb6c9000fa0d193f688b668f5f3eeda8fb05 (diff) | |
Add a new exception for live migration.
Raises new exception InvalidLocalStorage instead of
InvalidSharedStorage when block migration is used with shared storage.
Corrects the message of InvalidSharedStorage.
Fixes bug 1043165
Change-Id: I68bfac3f89276edc38c00ca963911fe07456dc0d
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/libvirt/driver.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 7bb4cbc22..6207c6caf 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -2242,7 +2242,7 @@ class LibvirtDriver(driver.ComputeDriver): """ # Checking shared storage connectivity # if block migration, instances_paths should not be on shared storage. - dest = FLAGS.host + source = FLAGS.host filename = dest_check_data["filename"] block_migration = dest_check_data["block_migration"] @@ -2252,12 +2252,12 @@ class LibvirtDriver(driver.ComputeDriver): if shared: reason = _("Block migration can not be used " "with shared storage.") - raise exception.InvalidSharedStorage(reason=reason, path=dest) + raise exception.InvalidLocalStorage(reason=reason, path=source) elif not shared: reason = _("Live migration can not be used " "without shared storage.") - raise exception.InvalidSharedStorage(reason=reason, path=dest) + raise exception.InvalidSharedStorage(reason=reason, path=source) def _get_compute_info(self, context, host): """Get compute host's information specified by key""" |