Merge remote-tracking branch 'upstream/devel' into devel

cloud/amazon/ec2_vpc_igw.py

@@ -20,18 +20,25 @@ short_description: Manage an AWS VPC Internet gateway
 description:
     - Manage an AWS VPC Internet gateway
 version_added: "2.0"
-author: Robert Estelle, @erydo
+author: Robert Estelle (@erydo)
 options:
   vpc_id:
     description:
       - The VPC ID for the VPC in which to manage the Internet Gateway.
     required: true
     default: null
+  region:
+    description:
+      - The AWS region to use. If not specified then the value of the EC2_REGION environment variable, if any, is used. See U(http://docs.aws.amazon.com/general/latest/gr/rande.html#ec2_region)
+    required: false
+    default: null
+    aliases: [ 'aws_region', 'ec2_region' ]
   state:
     description:
       - Create or terminate the IGW
     required: false
     default: present
+    choices: [ 'present', 'absent' ]
 extends_documentation_fragment: aws
 '''
 
@@ -39,16 +46,13 @@ EXAMPLES = '''
 # Note: These examples do not set authentication details, see the AWS Guide for details.
 
 # Ensure that the VPC has an Internet Gateway.
-# The Internet Gateway ID is can be accessed via {{igw.gateway_id}} for use
+# The Internet Gateway ID is can be accessed via {{igw.gateway_id}} for use in setting up NATs etc.
-# in setting up NATs etc.
+ec2_vpc_igw:
-      local_action:
+  vpc_id: vpc-abcdefgh
-        module: ec2_vpc_igw
-        vpc_id: {{vpc.vpc_id}}
-        region: {{vpc.vpc.region}}
   state: present
-      register: igw
+register: igw
-'''
 
+'''
 
 import sys  # noqa
 
@@ -117,7 +121,7 @@ def main():
     argument_spec.update(
         dict(
             vpc_id = dict(required=True),
-            state = dict(choices=['present', 'absent'], default='present')
+            state = dict(default='present', choices=['present', 'absent'])
         )
     )
 

cloud/amazon/s3_bucket.py

@@ -40,7 +40,7 @@ options:
     default: null
   region:
     description:
-      - AWS region to create the bucket in. If not set then the value of the AWS_REGION and EC2_REGION environment variables are checked, followed by the aws_region and ec2_region settings in the Boto config file.  If none of those are set the region defaults to the S3 Location: US Standard.
+      - "AWS region to create the bucket in. If not set then the value of the AWS_REGION and EC2_REGION environment variables are checked, followed by the aws_region and ec2_region settings in the Boto config file.  If none of those are set the region defaults to the S3 Location: US Standard."
     required: false
     default: null
   s3_url:

cloud/amazon/s3_lifecycle.py

@@ -20,7 +20,7 @@ short_description: Manage s3 bucket lifecycle rules in AWS
 description:
     - Manage s3 bucket lifecycle rules in AWS
 version_added: "2.0"
-author: Rob White (@wimnat)
+author: "Rob White (@wimnat)"
 notes:
   - If specifying expiration time as days then transition time must also be specified in days
   - If specifying expiration time as a date then transition time must also be specified as a date

cloud/vmware/vmware_target_canonical_facts.py

@@ -24,7 +24,7 @@ module: vmware_target_canonical_facts
 short_description: Return canonical (NAA) from an ESXi host
 description:
     - Return canonical (NAA) from an ESXi host based on SCSI target ID
-version_added: 2.0
+version_added: "2.0"
 author: Joseph Callen
 notes:
 requirements: