diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-26 20:50:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-26 20:50:44 +0000 |
| commit | d62e708889498cd22e633d99c40655be82b97c9a (patch) | |
| tree | 0cd3903f8380f9a3dd847efe9cdc07f2ab1329f4 /nova/compute | |
| parent | 39843a9cee45acc2f93ce1044323a369e11f50b8 (diff) | |
| parent | 39e8f5bd3bc976603c5a0a2dd4ada3dd6b79258d (diff) | |
| download | nova-d62e708889498cd22e633d99c40655be82b97c9a.tar.gz nova-d62e708889498cd22e633d99c40655be82b97c9a.tar.xz nova-d62e708889498cd22e633d99c40655be82b97c9a.zip | |
Merge "Cells: Add support for global cinder"
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/cells_api.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/nova/compute/cells_api.py b/nova/compute/cells_api.py index 6f1e12480..ddf959ef3 100644 --- a/nova/compute/cells_api.py +++ b/nova/compute/cells_api.py @@ -520,8 +520,6 @@ class ComputeCellsAPI(compute_api.API): """Attach an existing volume to an existing instance.""" if device and not block_device.match_device(device): raise exception.InvalidDevicePath(path=device) - device = self.compute_rpcapi.reserve_block_device_name( - 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, instance=instance) @@ -529,7 +527,7 @@ class ComputeCellsAPI(compute_api.API): with excutils.save_and_reraise_exception(): self.db.block_device_mapping_destroy_by_instance_and_device( context, instance['uuid'], device) - self._cast_to_cells(context, instance, 'attach_volume', + return self._call_to_cells(context, instance, 'attach_volume', volume_id, device) @validate_cell |