Module DOCUMENTATION should match argspec

lib/ansible/modules/cloud/amazon/_ec2_ami_find.py

@@ -158,6 +158,8 @@
     choices: ['success', 'fail']
     default: 'success'
     required: false
+extends_documentation_fragment:
+    - aws
 requirements:
   - "python >= 2.6"
   - boto

lib/ansible/modules/cloud/amazon/aws_acm_facts.py

@@ -25,7 +25,9 @@
   - boto3
 author:
   - Will Thames (@willthames)
-extends_documentation_fragment: aws
+extends_documentation_fragment:
+    - aws
+    - ec2
 '''
 
 EXAMPLES = '''

lib/ansible/modules/cloud/amazon/aws_api_gateway.py

@@ -63,6 +63,7 @@
     - 'Michael De La Rue (@mikedlr)'
 extends_documentation_fragment:
     - aws
+    - ec2
 notes:
    - A future version of this module will probably use tags or another
      ID so that an API can be create only once.

lib/ansible/modules/cloud/amazon/aws_direct_connect_connection.py

@@ -17,6 +17,9 @@
     The connection may later be associated or disassociated with a link aggregation group.
 version_added: "2.4"
 author: "Sloane Hertel (@s-hertel)"
+extends_documentation_fragment:
+    - aws
+    - ec2
 requirements:
   - boto3
   - botocore
@@ -36,7 +39,7 @@
     description:
       - The ID of the Direct Connect connection. I(name) or I(connection_id) is
         required to recreate or delete a connection. Modifying attributes of a
-        connection with I(force_update) will result in a new Direct Connect connection ID.
+        connection with I(forced_update) will result in a new Direct Connect connection ID.
   location:
     description:
       -  Where the Direct Connect connection is located. Required when I(state=present).
@@ -50,7 +53,7 @@
     description:
       - The ID of the link aggregation group you want to associate with the connection.
         This is optional in case a stand-alone connection is desired.
-  force_update:
+  forced_update:
     description:
       - To modify bandwidth or location the connection will need to be deleted and recreated.
         By default this will not happen - this option must be set to True.
@@ -80,7 +83,7 @@
   name: ansible-test-connection
   location: EqDC2
   bandwidth: 10Gbps
-  force_update: True
+  forced_update: True
 
 # delete the connection
 aws_direct_connect_connection:

lib/ansible/modules/cloud/amazon/aws_direct_connect_gateway.py

@@ -21,6 +21,9 @@
   - Deletes AWS Direct Connect Gateway
   - Attaches Virtual Gateways to Direct Connect Gateway
   - Detaches Virtual Gateways to Direct Connect Gateway
+extends_documentation_fragment:
+    - aws
+    - ec2
 requirements: [ boto3 ]
 options:
   state:

lib/ansible/modules/cloud/amazon/aws_direct_connect_link_aggregation_group.py

@@ -15,6 +15,9 @@
   - Create, delete, or modify a Direct Connect link aggregation group.
 version_added: "2.4"
 author: "Sloane Hertel (@s-hertel)"
+extends_documentation_fragment:
+    - aws
+    - ec2
 requirements:
   - boto3
   - botocore

lib/ansible/modules/cloud/amazon/aws_s3.py

@@ -143,7 +143,9 @@
 author:
     - "Lester Wade (@lwade)"
     - "Sloane Hertel (@s-hertel)"
-extends_documentation_fragment: aws
+extends_documentation_fragment:
+    - aws
+    - ec2
 '''
 
 EXAMPLES = '''

lib/ansible/modules/cloud/amazon/aws_s3_cors.py

@@ -32,6 +32,7 @@
     choices: [ 'present', 'absent' ]
 extends_documentation_fragment:
     - aws
+    - ec2
 '''
 
 EXAMPLES = '''

lib/ansible/modules/cloud/amazon/aws_waf_facts.py

@@ -21,7 +21,9 @@
 author:
   - Mike Mochan (@mmochan)
   - Will Thames (@willthames)
-extends_documentation_fragment: aws
+extends_documentation_fragment:
+    - aws
+    - ec2
 '''
 
 EXAMPLES = '''

lib/ansible/modules/cloud/amazon/cloudfront_facts.py

@@ -93,7 +93,7 @@
               I(domain_name_alias) to be specified.
         required: false
         default: false
-    streaming_distribution_configuration:
+    streaming_distribution_config:
         description:
             - Get the configuration information about a specified RTMP distribution.
               Requires I(distribution_id) or I(domain_name_alias) to be specified.
@@ -214,11 +214,11 @@
       I(distribution_id) or I(domain_name_alias) to be specified.
     returned: only if I(streaming_distribution) is true
     type: dict
-streaming_distribution_configuration:
+streaming_distribution_config:
     description: >
       Describes the streaming configuration information for the distribution.
       Requires I(distribution_id) or I(domain_name_alias) to be specified.
-    returned: only if I(streaming_distribution_configuration) is true
+    returned: only if I(streaming_distribution_config) is true
     type: dict
 summary:
     description: Gives a summary of distributions, streaming distributions and origin access identities.

lib/ansible/modules/cloud/amazon/cloudwatchevent_rule.py

@@ -20,6 +20,7 @@
 version_added: "2.2"
 extends_documentation_fragment:
   - aws
+  - ec2
 author: "Jim Dalton (@jsdalton) <jim.dalton@gmail.com>"
 requirements:
   - python >= 2.6

lib/ansible/modules/cloud/amazon/ec2_key.py

@@ -55,6 +55,7 @@
 
 extends_documentation_fragment:
   - aws
+  - ec2
 requirements: [ boto3 ]
 author:
   - "Vincent Viallet (@zbal)"

lib/ansible/modules/cloud/amazon/ec2_lc_find.py

@@ -51,6 +51,8 @@
 requirements:
   - "python >= 2.6"
   - boto3
+extends_documentation_fragment:
+    - aws
 """
 
 EXAMPLES = '''

lib/ansible/modules/cloud/amazon/ec2_metadata_facts.py

@@ -26,6 +26,8 @@
       The module must be called from within the EC2 instance itself.
 notes:
     - Parameters to filter on ec2_metadata_facts may be added later.
+extends_documentation_fragment:
+    - url
 '''
 
 EXAMPLES = '''

lib/ansible/modules/cloud/amazon/ec2_vpc_dhcp_option.py

@@ -108,7 +108,9 @@
     default: present
     choices: [ 'absent', 'present' ]
     version_added: "2.1"
-extends_documentation_fragment: aws
+extends_documentation_fragment:
+    - aws
+    - ec2
 requirements:
     - boto
 """

lib/ansible/modules/cloud/amazon/ec2_vpc_dhcp_option_facts.py

@@ -33,7 +33,7 @@
       - Provide this value as a list
     required: false
     default: None
-    aliases: ['DhcpOptionsIds']
+    aliases: ['DhcpOptionIds']
 extends_documentation_fragment:
     - aws
     - ec2

lib/ansible/modules/cloud/amazon/ec2_vpc_endpoint_facts.py

@@ -39,7 +39,9 @@
     required: false
     default: None
 author: Karen Cheng(@Etherdaemon)
-extends_documentation_fragment: aws
+extends_documentation_fragment:
+    - aws
+    - ec2
 '''
 
 EXAMPLES = '''

lib/ansible/modules/cloud/amazon/ec2_vpc_nacl.py

@@ -63,7 +63,9 @@
     choices: ['present', 'absent']
     default: present
 author: Mike Mochan(@mmochan)
-extends_documentation_fragment: aws
+extends_documentation_fragment:
+    - aws
+    - ec2
 requirements: [ botocore, boto3, json ]
 '''
 

lib/ansible/modules/cloud/amazon/ec2_vpc_peer.py

@@ -51,7 +51,9 @@
     default: present
     choices: ['present', 'absent', 'accept', 'reject']
 author: Mike Mochan(@mmochan)
-extends_documentation_fragment: aws
+extends_documentation_fragment:
+    - aws
+    - ec2
 requirements: [ botocore, boto3, json ]
 '''
 

lib/ansible/modules/cloud/amazon/ec2_vpc_peering_facts.py

@@ -31,7 +31,9 @@
     required: false
     default: None
 author: Karen Cheng(@Etherdaemon)
-extends_documentation_fragment: aws
+extends_documentation_fragment:
+  - aws
+  - ec2
 '''
 
 EXAMPLES = '''

lib/ansible/modules/cloud/amazon/ec2_vpc_subnet.py

@@ -87,7 +87,6 @@
     version_added: "2.5"
 extends_documentation_fragment:
     - aws
-    - ec2
 '''
 
 EXAMPLES = '''

lib/ansible/modules/cloud/amazon/ec2_vpc_vgw.py

@@ -59,7 +59,6 @@
     aliases: [ "resource_tags" ]
 author: Nick Aslanidis (@naslanidis)
 extends_documentation_fragment:
-  - aws
   - ec2
 '''
 

lib/ansible/modules/cloud/amazon/ec2_vpc_vpn.py

@@ -15,6 +15,9 @@
   - This module creates, modifies, and deletes VPN connections. Idempotence is achieved by using the filters
     option or specifying the VPN connection identifier.
 version_added: "2.4"
+extends_documentation_fragment:
+ - ec2
+ - aws
 requirements: ['boto3', 'botocore']
 author: "Sloane Hertel (@s-hertel)"
 options:

lib/ansible/modules/cloud/amazon/ecs_ecr.py

@@ -52,7 +52,9 @@
         default: 'present'
 author:
  - David M. Lee (@leedm777)
-extends_documentation_fragment: aws
+extends_documentation_fragment:
+  - aws
+  - ec2
 '''
 
 EXAMPLES = '''

lib/ansible/modules/cloud/amazon/efs_facts.py

@@ -45,7 +45,8 @@
         required: false
         default: None
 extends_documentation_fragment:
-    - aws
+  - aws
+  - ec2
 '''
 
 EXAMPLES = '''

lib/ansible/modules/cloud/amazon/elasticache_facts.py

@@ -19,7 +19,9 @@
 
 author:
   - Will Thames (@willthames)
-extends_documentation_fragment: aws
+extends_documentation_fragment:
+  - aws
+  - ec2
 '''
 
 EXAMPLES = '''

lib/ansible/modules/cloud/amazon/elasticache_parameter_group.py

@@ -28,6 +28,9 @@
   - Returns information about the specified cache cluster.
 version_added: "2.3"
 author: "Sloane Hertel (@s-hertel)"
+extends_documentation_fragment:
+  - aws
+  - ec2
 requirements: [ boto3, botocore ]
 options:
   group_family:

lib/ansible/modules/cloud/amazon/elasticache_snapshot.py

@@ -20,6 +20,9 @@
   - Returns information about the specified snapshot.
 version_added: "2.3"
 author: "Sloane Hertel (@s-hertel)"
+extends_documentation_fragment:
+  - aws
+  - ec2
 requirements: [ boto3, botocore ]
 options:
   name:

lib/ansible/modules/cloud/amazon/execute_lambda.py

@@ -29,6 +29,7 @@
 version_added: "2.2"
 extends_documentation_fragment:
   - aws
+  - ec2
 author: "Ryan Scott Brown (@ryansb) <ryansb@redhat.com>"
 requirements:
   - python >= 2.6

lib/ansible/modules/cloud/amazon/iam.py

@@ -99,7 +99,9 @@
 author:
     - "Jonathan I. Davila (@defionscode)"
     - "Paul Seiffert (@seiffert)"
-extends_documentation_fragment: aws
+extends_documentation_fragment:
+  - aws
+  - ec2
 '''
 
 EXAMPLES = '''

lib/ansible/modules/cloud/amazon/iam_group.py

@@ -57,6 +57,7 @@
 requirements: [ botocore, boto3 ]
 extends_documentation_fragment:
   - aws
+  - ec2
 '''
 
 EXAMPLES = '''

lib/ansible/modules/cloud/amazon/iam_managed_policy.py

@@ -45,6 +45,9 @@
     default: null
     choices: [ "present", "absent" ]
 author: "Dan Kozlowski (@dkhenry)"
+extends_documentation_fragment:
+  - aws
+  - ec2
 requirements:
     - boto3
     - botocore

lib/ansible/modules/cloud/amazon/iam_role.py

@@ -66,6 +66,7 @@
 requirements: [ botocore, boto3 ]
 extends_documentation_fragment:
   - aws
+  - ec2
 '''
 
 EXAMPLES = '''

lib/ansible/modules/cloud/amazon/iam_role_facts.py

@@ -37,7 +37,8 @@
         required: false
         default: None
 extends_documentation_fragment:
-    - aws
+  - aws
+  - ec2
 '''
 
 EXAMPLES = '''

lib/ansible/modules/cloud/amazon/lambda_alias.py

@@ -52,9 +52,9 @@
 requirements:
     - boto3
 extends_documentation_fragment:
-    - aws
-
-'''
+  - aws
+  - ec2
+ '''
 
 EXAMPLES = '''
 ---

lib/ansible/modules/cloud/amazon/lambda_event.py

@@ -66,6 +66,7 @@
     - boto3
 extends_documentation_fragment:
     - aws
+    - ec2
 
 '''