cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ec2_lc: deprecate device_type option (#55697)

Browse source 
Fixes #55308
This commit is contained in:
Martin Krizek 2019-04-24 13:00:01 +02:00 committed by Sloane Hertel
parent 27b64d6524
commit 43712f81e5
2 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/55308-ec2_lc-deprecations.yaml Normal file
View file

@ -0,0 +1,2 @@
minor_changes:
- ec2_lc - Remove deprecated ``device_type`` option (https://github.com/ansible/ansible/issues/55308)

15
lib/ansible/modules/cloud/amazon/ec2_lc.py
View file

@ -389,21 +389,6 @@ except ImportError:
def create_block_device_meta(module, volume): def create_block_device_meta(module, volume):
# device_type has been used historically to represent volume_type,
# however ec2_vol uses volume_type, as does the BlockDeviceType, so
# we add handling for either/or but not both
if 'device_type' in volume:
if 'volume_type' in volume:
module.fail_json(msg='device_type is a deprecated name for volume_type. '
'Do not use both device_type and volume_type')
else:
module.deprecate('device_type is deprecated for block devices - use volume_type instead',
version=2.9)
# rewrite device_type key to volume_type
if 'device_type' in volume:
volume['volume_type'] = volume.pop('device_type')
if 'snapshot' not in volume and 'ephemeral' not in volume and 'no_device' not in volume: if 'snapshot' not in volume and 'ephemeral' not in volume and 'no_device' not in volume:
if 'volume_size' not in volume: if 'volume_size' not in volume:
module.fail_json(msg='Size must be specified when creating a new volume or modifying the root volume') module.fail_json(msg='Size must be specified when creating a new volume or modifying the root volume')