diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-12 14:41:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-12 14:41:02 +0000 |
| commit | 74a7294cf68ad64367620caac52c7670d6d379ca (patch) | |
| tree | f758a51d9e5dbdfab611be8bfce9b12b644f8fa8 | |
| parent | 1bd3acfb0459ba4cd773848e71581f874be33a2e (diff) | |
| parent | 6a18ada2b12294b98ab385576a3e9669f4f52a3d (diff) | |
Merge "Don't block instance delete on missing block device volume"
| -rw-r--r-- | nova/compute/manager.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 19bd7e9ba..b3884dd11 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -744,6 +744,9 @@ class ComputeManager(manager.SchedulerDependentManager): except exception.DiskNotFound as exc: LOG.warn(_('Ignoring DiskNotFound: %s') % exc, instance=instance) + except exception.VolumeNotFound as exc: + LOG.warn(_('Ignoring VolumeNotFound: %s') % exc, + instance=instance) self._notify_about_instance_usage(context, instance, "shutdown.end") |