diff options
| author | Brian Lamar <brian.lamar@rackspace.com> | 2011-08-25 12:50:36 -0400 |
|---|---|---|
| committer | Brian Lamar <brian.lamar@rackspace.com> | 2011-08-25 12:50:36 -0400 |
| commit | 6758779249d490fd21bfdeae6d40adfc33d8cd17 (patch) | |
| tree | 968009fd767e1dce993c2f516c7031bf3e518253 | |
| parent | a14e2b1d8cbc87d5bcb31b9127035160fde4acc5 (diff) | |
| download | nova-6758779249d490fd21bfdeae6d40adfc33d8cd17.tar.gz nova-6758779249d490fd21bfdeae6d40adfc33d8cd17.tar.xz nova-6758779249d490fd21bfdeae6d40adfc33d8cd17.zip | |
Reverted two mistakes when looking over full diff.
| -rw-r--r-- | nova/api/ec2/cloud.py | 10 | ||||
| -rw-r--r-- | nova/compute/manager.py | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index c5a360426..cf9437b08 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -104,12 +104,10 @@ def state_description_from_vm_state(vm_state): # TODO(yamahata): hypervisor dependent default device name _DEFAULT_ROOT_DEVICE_NAME = '/dev/sda1' -_DEFAULT_MAPPINGS = { - 'ami': 'sda1', - 'ephemeral0': 'sda2', - 'root': _DEFAULT_ROOT_DEVICE_NAME, - 'swap': 'sda3', -} +_DEFAULT_MAPPINGS = {'ami': 'sda1', + 'ephemeral0': 'sda2', + 'root': _DEFAULT_ROOT_DEVICE_NAME, + 'swap': 'sda3'} def _parse_block_device_mapping(bdm): diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 5427b896e..a3ced1279 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -547,8 +547,6 @@ class ComputeManager(manager.SchedulerDependentManager): vm_state=vm_states.REBUILDING, task_state=task_states.BLOCK_DEVICE_MAPPING) - bd_mapping = self._setup_block_device_mapping(context, instance_id) - image_ref = kwargs.get('image_ref') instance_ref.image_ref = image_ref instance_ref.injected_files = kwargs.get('injected_files', []) |