diff options
| author | Chris Behrens <cbehrens@codestud.com> | 2013-06-03 20:02:21 +0000 |
|---|---|---|
| committer | Chris Behrens <cbehrens@codestud.com> | 2013-06-11 21:47:42 +0000 |
| commit | 39e8f5bd3bc976603c5a0a2dd4ada3dd6b79258d (patch) | |
| tree | 9755a3827d0259c9b34c188523bf02c77a51d286 /nova/compute | |
| parent | 9b5e206027149861de86585690bc3d5141ec240e (diff) | |
| download | nova-39e8f5bd3bc976603c5a0a2dd4ada3dd6b79258d.tar.gz nova-39e8f5bd3bc976603c5a0a2dd4ada3dd6b79258d.tar.xz nova-39e8f5bd3bc976603c5a0a2dd4ada3dd6b79258d.zip | |
Cells: Add support for global cinder
Implements cinder support for compute cells when cinder is a global
installation. Adds syncing of the block device mapping table between
child cells and API cells.
Implements blueprint cells-cinder-support
Change-Id: Ife5be9922db0742c8ee4f970517396be86597cce
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 |