From 43712f81e50c8bf546fc1f4d53deff64ecaaa91f Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Wed, 24 Apr 2019 13:00:01 +0200 Subject: [PATCH] ec2_lc: deprecate device_type option (#55697) Fixes #55308 --- .../fragments/55308-ec2_lc-deprecations.yaml | 2 ++ lib/ansible/modules/cloud/amazon/ec2_lc.py | 15 --------------- 2 files changed, 2 insertions(+), 15 deletions(-) create mode 100644 changelogs/fragments/55308-ec2_lc-deprecations.yaml diff --git a/changelogs/fragments/55308-ec2_lc-deprecations.yaml b/changelogs/fragments/55308-ec2_lc-deprecations.yaml new file mode 100644 index 0000000000..e25d029c17 --- /dev/null +++ b/changelogs/fragments/55308-ec2_lc-deprecations.yaml @@ -0,0 +1,2 @@ +minor_changes: + - ec2_lc - Remove deprecated ``device_type`` option (https://github.com/ansible/ansible/issues/55308) diff --git a/lib/ansible/modules/cloud/amazon/ec2_lc.py b/lib/ansible/modules/cloud/amazon/ec2_lc.py index 24eb1259e9..f08a3beb30 100644 --- a/lib/ansible/modules/cloud/amazon/ec2_lc.py +++ b/lib/ansible/modules/cloud/amazon/ec2_lc.py @@ -389,21 +389,6 @@ except ImportError: 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 'volume_size' not in volume: module.fail_json(msg='Size must be specified when creating a new volume or modifying the root volume')