From d7e66f16a6528af398f6299a041b925c3ec1d94f Mon Sep 17 00:00:00 2001 From: "/v\\atthew L Daniel" Date: Wed, 22 Aug 2018 19:44:49 -0700 Subject: [PATCH] Correct the default doc for attached in ec2_eni (#44523) * Correct the default doc for attached in ec2_eni Also corrected a typo in the summary * Address ansible-test sanity error about E324 * Fix and remove the E325 suppression for ec2_eni --- lib/ansible/modules/cloud/amazon/ec2_eni.py | 8 ++++++-- test/sanity/validate-modules/ignore.txt | 2 -- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/ansible/modules/cloud/amazon/ec2_eni.py b/lib/ansible/modules/cloud/amazon/ec2_eni.py index eccc5b60ac..ae4771bd63 100644 --- a/lib/ansible/modules/cloud/amazon/ec2_eni.py +++ b/lib/ansible/modules/cloud/amazon/ec2_eni.py @@ -60,9 +60,8 @@ options: default: 0 attached: description: - - Specifies if network interface should be attached or detached from instance. If ommited, attachment status + - Specifies if network interface should be attached or detached from instance. If omitted, attachment status won't change - default: 'yes' version_added: 2.2 type: bool force_detach: @@ -70,16 +69,19 @@ options: - Force detachment of the interface. This applies either when explicitly detaching the interface by setting instance_id to None or when deleting an interface with state=absent. default: 'no' + type: bool delete_on_termination: description: - Delete the interface when the instance it is attached to is terminated. You can only specify this flag when the interface is being modified, not on creation. required: false + type: bool source_dest_check: description: - By default, interfaces perform source/destination checks. NAT instances however need this check to be disabled. You can only specify this flag when the interface is being modified, not on creation. required: false + type: bool secondary_private_ip_addresses: description: - A list of IP addresses to assign as secondary IP addresses to the network interface. @@ -91,6 +93,7 @@ options: - To be used with I(secondary_private_ip_addresses) to determine whether or not to remove any secondary IP addresses other than those specified. Set secondary_private_ip_addresses to an empty list to purge all secondary addresses. default: no + type: bool version_added: 2.5 secondary_private_ip_address_count: description: @@ -103,6 +106,7 @@ options: to be reassigned to the specified network interface. required: false default: 'no' + type: bool version_added: 2.7 extends_documentation_fragment: - aws diff --git a/test/sanity/validate-modules/ignore.txt b/test/sanity/validate-modules/ignore.txt index aafe0da1cf..0deac94080 100644 --- a/test/sanity/validate-modules/ignore.txt +++ b/test/sanity/validate-modules/ignore.txt @@ -54,8 +54,6 @@ lib/ansible/modules/cloud/amazon/ec2_elb.py E326 lib/ansible/modules/cloud/amazon/ec2_elb_facts.py E323 lib/ansible/modules/cloud/amazon/ec2_elb_lb.py E324 lib/ansible/modules/cloud/amazon/ec2_elb_lb.py E325 -lib/ansible/modules/cloud/amazon/ec2_eni.py E324 -lib/ansible/modules/cloud/amazon/ec2_eni.py E325 lib/ansible/modules/cloud/amazon/ec2_group.py E322 lib/ansible/modules/cloud/amazon/ec2_group.py E325 lib/ansible/modules/cloud/amazon/ec2_instance.py E324