From a1febd95b7cd55fc6f14f096dd801fa8712f91be Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Wed, 22 Aug 2018 16:48:22 -0500 Subject: [PATCH] Remove deprecated ec2_facts (#44536) * Remove deprecated ec2_facts * Add changelog --- changelogs/fragments/ec2-facts.yaml | 2 ++ lib/ansible/modules/cloud/amazon/_ec2_facts.py | 1 - lib/ansible/modules/cloud/amazon/ec2_metadata_facts.py | 3 --- 3 files changed, 2 insertions(+), 4 deletions(-) create mode 100644 changelogs/fragments/ec2-facts.yaml delete mode 120000 lib/ansible/modules/cloud/amazon/_ec2_facts.py diff --git a/changelogs/fragments/ec2-facts.yaml b/changelogs/fragments/ec2-facts.yaml new file mode 100644 index 00000000000..eecb8fb6a5d --- /dev/null +++ b/changelogs/fragments/ec2-facts.yaml @@ -0,0 +1,2 @@ +removed_features: +- ec2_facts - deprecated module removed (https://github.com/ansible/ansible/pull/44536) diff --git a/lib/ansible/modules/cloud/amazon/_ec2_facts.py b/lib/ansible/modules/cloud/amazon/_ec2_facts.py deleted file mode 120000 index 2e5b1b9b3cd..00000000000 --- a/lib/ansible/modules/cloud/amazon/_ec2_facts.py +++ /dev/null @@ -1 +0,0 @@ -ec2_metadata_facts.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/amazon/ec2_metadata_facts.py b/lib/ansible/modules/cloud/amazon/ec2_metadata_facts.py index b0543869d80..eea90b7b203 100644 --- a/lib/ansible/modules/cloud/amazon/ec2_metadata_facts.py +++ b/lib/ansible/modules/cloud/amazon/ec2_metadata_facts.py @@ -541,9 +541,6 @@ def main(): supports_check_mode=True, ) - if module._name == 'ec2_facts': - module.deprecate("The 'ec2_facts' module is being renamed 'ec2_metadata_facts'", version=2.7) - ec2_metadata_facts = Ec2Metadata(module).run() ec2_metadata_facts_result = dict(changed=False, ansible_facts=ec2_metadata_facts)