diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-10-24 19:11:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-10-24 19:11:24 +0000 |
| commit | 60600e27edadc03dfa43c25110259c3b6f3fa85f (patch) | |
| tree | 93fc3eb4b1a46971deed39b21aaaf8223b799de3 | |
| parent | 0a868f05abe5c1b55713252ed5a42bf384490697 (diff) | |
| parent | 13ff1ea8f1aa81274f45cd0480ee5b7649fe03a6 (diff) | |
| download | nova-60600e27edadc03dfa43c25110259c3b6f3fa85f.tar.gz nova-60600e27edadc03dfa43c25110259c3b6f3fa85f.tar.xz nova-60600e27edadc03dfa43c25110259c3b6f3fa85f.zip | |
Merge "Use instance_exists to check existence"
| -rw-r--r-- | nova/compute/manager.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index eae7149e9..97f0cef5f 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -2109,7 +2109,7 @@ class ComputeManager(manager.SchedulerDependentManager): LOG.audit(_('Detach volume %(volume_id)s from mountpoint %(mp)s'), locals(), context=context, instance=instance) - if instance['name'] not in self.driver.list_instances(): + if not self.driver.instance_exists(instance['name']): LOG.warn(_('Detaching volume from unknown instance'), context=context, instance=instance) connection_info = jsonutils.loads(bdm['connection_info']) |