diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-12-01 06:17:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-12-01 06:17:21 +0000 |
| commit | b1b7eede2226142615b32b437a4e153324daf83a (patch) | |
| tree | 442bd47654a611fc90e90c19669f55dee9e8be7c | |
| parent | 63d323c271e815281167355e8cc4e7c9f0690068 (diff) | |
| parent | d8301748152e10ba64b4cebb79d4dad139988cea (diff) | |
Merge "Remove boot-from-volume unreachable code path (#894172)"
| -rw-r--r-- | nova/compute/manager.py | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 9aeccc067..0cbddca3e 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -305,17 +305,6 @@ class ComputeManager(manager.SchedulerDependentManager): context, bdm['id'], {'volume_id': vol['id']}) bdm['volume_id'] = vol['id'] - if not ((bdm['snapshot_id'] is None) or - (bdm['volume_id'] is not None)): - LOG.error(_('corrupted state of block device mapping ' - 'id: %(id)s snapshot: %(snapshot_id)s ' - 'volume: %(volume_id)s') % - {'id': bdm['id'], - 'snapshot_id': bdm['snapshot'], - 'volume_id': bdm['volume_id']}) - raise exception.ApiError(_('broken block device mapping %d') % - bdm['id']) - if bdm['volume_id'] is not None: volume_api.check_attach(context, volume_id=bdm['volume_id']) |