From 5ea7480e90ad5d5bcec96d0b403e72c5d8ad0695 Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Wed, 22 Aug 2018 16:48:09 -0500 Subject: [PATCH] Remove deprecated s3 module (#44537) * Remove deprecated s3 module * Add changelog --- changelogs/fragments/s3.yaml | 2 ++ lib/ansible/modules/cloud/amazon/_s3.py | 1 - lib/ansible/modules/cloud/amazon/aws_s3.py | 3 --- 3 files changed, 2 insertions(+), 4 deletions(-) create mode 100644 changelogs/fragments/s3.yaml delete mode 120000 lib/ansible/modules/cloud/amazon/_s3.py diff --git a/changelogs/fragments/s3.yaml b/changelogs/fragments/s3.yaml new file mode 100644 index 00000000000..834cffd7cde --- /dev/null +++ b/changelogs/fragments/s3.yaml @@ -0,0 +1,2 @@ +removed_features: +- s3 - deprecated module removed (https://github.com/ansible/ansible/pull/44537) diff --git a/lib/ansible/modules/cloud/amazon/_s3.py b/lib/ansible/modules/cloud/amazon/_s3.py deleted file mode 120000 index f56735c39c9..00000000000 --- a/lib/ansible/modules/cloud/amazon/_s3.py +++ /dev/null @@ -1 +0,0 @@ -aws_s3.py \ No newline at end of file diff --git a/lib/ansible/modules/cloud/amazon/aws_s3.py b/lib/ansible/modules/cloud/amazon/aws_s3.py index 367f89c1687..15c00a09ec1 100644 --- a/lib/ansible/modules/cloud/amazon/aws_s3.py +++ b/lib/ansible/modules/cloud/amazon/aws_s3.py @@ -702,9 +702,6 @@ def main(): ['mode', 'geturl', ['object']]], ) - if module._name == 's3': - module.deprecate("The 's3' module is being renamed 'aws_s3'", version=2.7) - bucket = module.params.get('bucket') encrypt = module.params.get('encrypt') expiry = module.params.get('expiry')