diff --git a/docs/docsite/rst/porting_guides/porting_guide_2.10.rst b/docs/docsite/rst/porting_guides/porting_guide_2.10.rst index 2a8a28b7e62..5a2c70d9b96 100644 --- a/docs/docsite/rst/porting_guides/porting_guide_2.10.rst +++ b/docs/docsite/rst/porting_guides/porting_guide_2.10.rst @@ -45,7 +45,7 @@ Modules removed The following modules no longer exist: -* No notable changes +* letsencrypt use :ref:`acme_certificate ` instead. Deprecation notices diff --git a/lib/ansible/modules/crypto/acme/_letsencrypt.py b/lib/ansible/modules/crypto/acme/_letsencrypt.py deleted file mode 120000 index 3fdd4055b40..00000000000 --- a/lib/ansible/modules/crypto/acme/_letsencrypt.py +++ /dev/null @@ -1 +0,0 @@ -acme_certificate.py \ No newline at end of file diff --git a/lib/ansible/modules/crypto/acme/_letsencrypt.py b/lib/ansible/modules/crypto/acme/_letsencrypt.py new file mode 100644 index 00000000000..b1fa1f81f4b --- /dev/null +++ b/lib/ansible/modules/crypto/acme/_letsencrypt.py @@ -0,0 +1,31 @@ +#!/usr/bin/python +# +# This file is part of Ansible +# +# Ansible is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Ansible is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Ansible. If not, see . +# + +from __future__ import absolute_import, division, print_function +__metaclass__ = type + +ANSIBLE_METADATA = {'metadata_version': '1.1', + 'status': ['removed'], + 'supported_by': 'community'} + + +from ansible.module_utils.common.removed import removed_module + + +if __name__ == '__main__': + removed_module(removed_in="2.10") diff --git a/lib/ansible/modules/crypto/acme/acme_certificate.py b/lib/ansible/modules/crypto/acme/acme_certificate.py index 28152d031ec..69c69adfe99 100644 --- a/lib/ansible/modules/crypto/acme/acme_certificate.py +++ b/lib/ansible/modules/crypto/acme/acme_certificate.py @@ -1020,8 +1020,6 @@ def main(): ), supports_check_mode=True, ) - if module._name == 'letsencrypt': - module.deprecate("The 'letsencrypt' module is being renamed 'acme_certificate'", version='2.10') set_crypto_backend(module) # AnsibleModule() changes the locale, so change it back to C because we rely on time.strptime() when parsing certificate dates.