kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-22 09:50:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Explicitly define None as the default value for missing kms_key_id key

Browse source 
in manifest. None should be returned by default, but this makes it
easier to see.
This commit is contained in:
Veli-Matti Lintu 2018-06-14 09:38:36 +03:00
parent 8e24c5e795
commit 2a741a81bf
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

@ -26,7 +26,7 @@ def validate_manifest(data, validator, error):
bootloader = data['system']['bootloader'] bootloader = data['system']['bootloader']
virtualization = data['provider']['virtualization'] virtualization = data['provider']['virtualization']
encrypted = data['provider'].get('encrypted', False) encrypted = data['provider'].get('encrypted', False)
kms_key_id = data['provider'].get('kms_key_id') kms_key_id = data['provider'].get('kms_key_id', None)
backing = data['volume']['backing'] backing = data['volume']['backing']
partition_type = data['volume']['partitions']['type'] partition_type = data['volume']['partitions']['type']
enhanced_networking = data['provider']['enhanced_networking'] if 'enhanced_networking' in data['provider'] else None enhanced_networking = data['provider']['enhanced_networking'] if 'enhanced_networking' in data['provider'] else None

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

@ -19,7 +19,7 @@ class Create(Task):
# EBS volumes support encryption. KMS key id is optional and default key # EBS volumes support encryption. KMS key id is optional and default key
# is used when it is not defined. # is used when it is not defined.
encrypted = info.manifest.data['provider'].get('encrypted', False) encrypted = info.manifest.data['provider'].get('encrypted', False)
kms_key_id = info.manifest.data['provider'].get('kms_key_id') kms_key_id = info.manifest.data['provider'].get('kms_key_id', None)
info.volume.create(info._ec2['connection'], info._ec2['host']['availabilityZone'], tags=tags, encrypted=encrypted, kms_key_id=kms_key_id) info.volume.create(info._ec2['connection'], info._ec2['host']['availabilityZone'], tags=tags, encrypted=encrypted, kms_key_id=kms_key_id)