diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-16 01:03:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-16 01:03:59 +0000 |
| commit | 414cc82289f6ecbbdff6ddd5b138d1a72df37b62 (patch) | |
| tree | 7277f98c152465d02c4b8077814bf0aeceae6da3 /nova/compute | |
| parent | 596e0b392a961c28c5d8f81ec45dc6e2b28578e2 (diff) | |
| parent | 1504cbc5d4a27695fa663f0b0f3f7b48745bdb45 (diff) | |
Merge "Add option to allow cross AZ attach configurable"
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 2 | ||||
| -rw-r--r-- | nova/compute/cells_api.py | 2 | ||||
| -rwxr-xr-x | nova/compute/manager.py | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index a095960d0..5e160d2ef 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -2244,7 +2244,7 @@ class API(base.Base): context, device=device, instance=instance, volume_id=volume_id) try: volume = self.volume_api.get(context, volume_id) - self.volume_api.check_attach(context, volume) + self.volume_api.check_attach(context, volume, instance=instance) self.volume_api.reserve_volume(context, volume) self.compute_rpcapi.attach_volume(context, instance=instance, volume_id=volume_id, mountpoint=device) diff --git a/nova/compute/cells_api.py b/nova/compute/cells_api.py index 50449df04..1e30331bc 100644 --- a/nova/compute/cells_api.py +++ b/nova/compute/cells_api.py @@ -524,7 +524,7 @@ class ComputeCellsAPI(compute_api.API): context, device=device, instance=instance, volume_id=volume_id) try: volume = self.volume_api.get(context, volume_id) - self.volume_api.check_attach(context, volume) + self.volume_api.check_attach(context, volume, instance=instance) except Exception: with excutils.save_and_reraise_exception(): self.db.block_device_mapping_destroy_by_instance_and_device( diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 2245627e7..26df2ac9b 100755 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -645,7 +645,8 @@ class ComputeManager(manager.SchedulerDependentManager): if bdm['volume_id'] is not None: volume = self.volume_api.get(context, bdm['volume_id']) - self.volume_api.check_attach(context, volume) + self.volume_api.check_attach(context, volume, + instance=instance) cinfo = self._attach_volume_boot(context, instance, volume, |