From 75437bbe3cac597c66f7a634567d1c04252c511b Mon Sep 17 00:00:00 2001 From: Will Thames Date: Fri, 20 Jan 2017 10:50:41 +1000 Subject: [PATCH] Fix ec2_vpc deprecation docs Clarify the CHANGELOG with deprecation timeline Correct name of `ec2_vpc_net` module to be used instead --- CHANGELOG.md | 2 +- lib/ansible/modules/cloud/amazon/_ec2_vpc.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5374f8c9147..c58b2e21acb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,7 +28,7 @@ Ansible Changes By Release the old overwriting behaviour via the config option. In 2.5, multiple --tags options will be merged with no way to go back to the old behaviour. * Modules - * ec2_vpc will be deprecated in 2.5 + * ec2_vpc will be deprecated in 2.3 and removed in 2.5 ###New Modules: - archive diff --git a/lib/ansible/modules/cloud/amazon/_ec2_vpc.py b/lib/ansible/modules/cloud/amazon/_ec2_vpc.py index f4ed7995f6a..d5638c50544 100644 --- a/lib/ansible/modules/cloud/amazon/_ec2_vpc.py +++ b/lib/ansible/modules/cloud/amazon/_ec2_vpc.py @@ -26,7 +26,7 @@ description: - Create or terminates AWS virtual private clouds. This module has a dependency on python-boto. version_added: "1.4" deprecated: >- - Deprecated in 2.3. Use M(epc_vpc_net) along with supporting modules including + Deprecated in 2.3. Use M(ec2_vpc_net) along with supporting modules including M(ec2_vpc_igw), M(ec2_vpc_route_table), M(ec2_vpc_subnet), M(ec2_vpc_dhcp_options), M(ec2_vpc_nat_gateway), M(ec2_vpc_nacl). options: