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

Simplify enhanced networking check

Browse source
This commit is contained in:
Anders Ingemann 2015-04-12 08:56:15 +02:00
parent 3c17c756a1
commit d9adb293eb
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -105,7 +105,7 @@ def resolve_tasks(taskset, manifest):
]) ])
taskset.discard(filesystem.FStab) taskset.discard(filesystem.FStab)
if 'enhanced_networking' in manifest.provider and manifest.provider['enhanced_networking'] == 'simple': if manifest.provider.get('enhanced_networking', None) == 'simple':
taskset.update([kernel.AddDKMSPackages, taskset.update([kernel.AddDKMSPackages,
tasks.network.InstallEnhancedNetworking, tasks.network.InstallEnhancedNetworking,
kernel.UpdateInitramfs]) kernel.UpdateInitramfs])

2
bootstrapvz/providers/ec2/tasks/ami.py
View file

@ -121,7 +121,7 @@ class RegisterAMI(Task):
registration_params['kernel_id'] = config_get(akis_path, [info._ec2['region'], registration_params['kernel_id'] = config_get(akis_path, [info._ec2['region'],
info.manifest.system['architecture']]) info.manifest.system['architecture']])
if 'enhanced_networking' in info.manifest.provider and info.manifest.provider['enhanced_networking'] == 'simple': if info.manifest.provider.get('enhanced_networking', None) == 'simple':
registration_params['sriov_net_support'] = 'simple' registration_params['sriov_net_support'] = 'simple'
info._ec2['image'] = info._ec2['connection'].register_image(**registration_params) info._ec2['image'] = info._ec2['connection'].register_image(**registration_params)