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
+  state: present
-        vpc_id: {{vpc.vpc_id}}
+register: igw
-        region: {{vpc.vpc.region}}
-        state: present
-      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
@@ -43,9 +43,9 @@ options:
     default: null
   prefix:
     description:
-      - "Prefix identifying one or more objects to which the rule applies. If no prefix is specified, the rule will apply to the whole bucket."
+      - "Prefix identifying one or more objects to which the rule applies.  If no prefix is specified, the rule will apply to the whole bucket."
-      required: false
+    required: false
-      default: null
+    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."
@@ -54,8 +54,8 @@ options:
   rule_id:
     description:
       - "Unique identifier for the rule. The value cannot be longer than 255 characters. A unique value for the rule will be generated if no value is provided."
-      required: false
+    required: false
-      default: null
+    default: null
   state:
     description:
       - "Create or remove the lifecycle rule"

cloud/vmware/vmware_target_canonical_facts.py

@@ -24,14 +24,14 @@ 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:
     - Tested on vSphere 5.5
     - PyVmomi installed
 options:
- hostname:
+    hostname:
         description:
             - The hostname or IP address of the vSphere vCenter
         required: True

windows/win_package.py

@@ -44,7 +44,7 @@ options:
   product_id:
     description:
       - product id of the installed package (used for checking if already installed)
-	required: false
+    required: false
     default: null
     aliases: []
   arguments:
@@ -54,20 +54,20 @@ options:
     aliases: []
   state:
     description:
-	  - Install or Uninstall
+      - Install or Uninstall
-	choices:
+    choices:
       - present
       - absent
     default: present
     aliases: [ensure]
   user_name:
     description:
-	  - Username of an account with access to the package if its located on a file share. Only needed if the winrm user doesn't have access to the package. Also specify user_password for this to function properly.
+      - Username of an account with access to the package if its located on a file share. Only needed if the winrm user doesn't have access to the package. Also specify user_password for this to function properly.
     default: null
     aliases: []
   user_password:
     description:
-	  - Password of an account with access to the package if its located on a file share. Only needed if the winrm user doesn't have access to the package. Also specify user_name for this to function properly.
+      - Password of an account with access to the package if its located on a file share. Only needed if the winrm user doesn't have access to the package. Also specify user_name for this to function properly.
     default: null
     aliases: []
 author: Trond Hindenes