From cc06f4cba1c7eb212cf4b18fa38f9356336f6f9d Mon Sep 17 00:00:00 2001 From: Will Thames Date: Tue, 1 May 2018 05:17:15 +1000 Subject: [PATCH] Improve deprecation message for ec2_vpc_dhcp_options modules (#38459) Make it clear to user why ec2_vpc_dhcp_options and ec2_vpc_dhcp_options_facts have been deprecated --- lib/ansible/modules/cloud/amazon/ec2_vpc_dhcp_option.py | 5 +++++ .../modules/cloud/amazon/ec2_vpc_dhcp_option_facts.py | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/lib/ansible/modules/cloud/amazon/ec2_vpc_dhcp_option.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_dhcp_option.py index 78ab16e2f37..baf027e911f 100644 --- a/lib/ansible/modules/cloud/amazon/ec2_vpc_dhcp_option.py +++ b/lib/ansible/modules/cloud/amazon/ec2_vpc_dhcp_option.py @@ -286,6 +286,11 @@ def main(): ) module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=True) + if module._name == 'ec2_vpc_dhcp_options': + module.deprecate("The 'ec2_vpc_dhcp_options' module has been renamed " + "'ec2_vpc_dhcp_option' (option is no longer plural)", + version=2.8) + params = module.params found = False changed = False diff --git a/lib/ansible/modules/cloud/amazon/ec2_vpc_dhcp_option_facts.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_dhcp_option_facts.py index eef3e50b9af..9f6c6ef08d4 100644 --- a/lib/ansible/modules/cloud/amazon/ec2_vpc_dhcp_option_facts.py +++ b/lib/ansible/modules/cloud/amazon/ec2_vpc_dhcp_option_facts.py @@ -126,6 +126,10 @@ def main(): module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=True) + if module._name == 'ec2_vpc_dhcp_options_facts': + module.deprecate("The 'ec2_vpc_dhcp_options_facts' module has been renamed " + "'ec2_vpc_dhcp_option_facts' (option is no longer plural)", + version=2.8) # Validate Requirements if not HAS_BOTO3: