kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 15:36:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Try and fix hvm registration

Browse source 
It's still not working unfortunately, but it's a step in the right direction
This commit is contained in:
Anders Ingemann 2014-01-05 02:18:59 +01:00
parent 8b5bc77650
commit 44b23c9cd8
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
providers/ec2/tasks/ami.py
View file

@ -149,7 +149,9 @@ class RegisterAMI(Task):
if info.manifest.volume['backing'] == 's3': if info.manifest.volume['backing'] == 's3':
grub_boot_device = 'hd0' grub_boot_device = 'hd0'
else: else:
registration_params['root_device_name'] = '/dev/sda' root_dev_name = {'pvm': '/dev/sda',
'hvm': '/dev/xvda'}.get(info.manifest.virtualization)
registration_params['root_device_name'] = root_dev_name
from base.fs.partitionmaps.none import NoPartitions from base.fs.partitionmaps.none import NoPartitions
if isinstance(info.volume.partition_map, NoPartitions): if isinstance(info.volume.partition_map, NoPartitions):
grub_boot_device = 'hd0' grub_boot_device = 'hd0'
@ -161,7 +163,7 @@ class RegisterAMI(Task):
block_device = BlockDeviceType(snapshot_id=info.snapshot.id, delete_on_termination=True, block_device = BlockDeviceType(snapshot_id=info.snapshot.id, delete_on_termination=True,
size=info.volume.partition_map.get_total_size() / 1024) size=info.volume.partition_map.get_total_size() / 1024)
registration_params['block_device_map'] = BlockDeviceMapping() registration_params['block_device_map'] = BlockDeviceMapping()
registration_params['block_device_map']['/dev/sda'] = block_device registration_params['block_device_map'][root_dev_name] = block_device
if info.manifest.virtualization == 'hvm': if info.manifest.virtualization == 'hvm':
registration_params['virtualization_type'] = 'hvm' registration_params['virtualization_type'] = 'hvm'