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

Simpler checks for manifest support

Browse source
This commit is contained in:
Anders Ingemann 2015-04-11 13:54:39 +02:00
parent a4bd52bf9e
commit d81ac0972f
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
bootstrapvz/providers/ec2/__init__.py
View file

@ -48,17 +48,14 @@ def validate_manifest(data, validator, error):
if virtualization == 'pvm' and bootloader != 'pvgrub': if virtualization == 'pvm' and bootloader != 'pvgrub':
error('Paravirtualized AMIs only support pvgrub as a bootloader', ['system', 'bootloader']) error('Paravirtualized AMIs only support pvgrub as a bootloader', ['system', 'bootloader'])
if virtualization == 'hvm': if backing != 'ebs' and virtualization == 'hvm':
if backing != 'ebs':
error('HVM AMIs currently only work when they are EBS backed', ['volume', 'backing']) error('HVM AMIs currently only work when they are EBS backed', ['volume', 'backing'])
if backing == 's3': if backing == 's3' and partition_type != 'none':
if partition_type != 'none':
error('S3 backed AMIs currently only work with unpartitioned volumes', ['system', 'bootloader']) error('S3 backed AMIs currently only work with unpartitioned volumes', ['system', 'bootloader'])
if enhanced_networking == 'simple': if enhanced_networking == 'simple' and virtualization != 'hvm':
if virtualization != 'hvm': error('Enhanced networking only works with HVM virtualization', ['provider', 'virtualization'])
error('Enhanced networking currently only works with HVM virtualization', ['provider', 'virtualization'])
def resolve_tasks(taskset, manifest): def resolve_tasks(taskset, manifest):