Update ec2.py

Update instance_type description to feature up-to-date list of instance types. Matches format of 'ebs_optimized' param which also includes a link.

Update region description to feature up-to-date list of ec2 regions. Matches format of 'ebs_optimized' param which also includes a link.

Updated choices for monitoring param to be explicit bool matching default 'yes'.

Updated choices for source_dest_check to be explicit bool matching default 'true'.

Updated tenancy choices to remove redundant phrasing in comments.
reviewable/pr18780/r1
Tom Paine 10 years ago
parent 7dd9f57e16
commit 1f7f7c7dbc

@ -44,7 +44,7 @@ options:
region: region:
version_added: "1.2" version_added: "1.2"
description: description:
- The AWS region to use. Must be specified if ec2_url is not used. If not specified then the value of the EC2_REGION environment variable, if any, is used. - The AWS region to use. Must be specified if ec2_url is not used. 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 required: false
default: null default: null
aliases: [ 'aws_region', 'ec2_region' ] aliases: [ 'aws_region', 'ec2_region' ]
@ -57,16 +57,17 @@ options:
aliases: [ 'aws_zone', 'ec2_zone' ] aliases: [ 'aws_zone', 'ec2_zone' ]
instance_type: instance_type:
description: description:
- instance type to use for the instance - instance type to use for the instance, see U(http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html)
required: true required: true
default: null default: null
aliases: [] aliases: []
tenancy: tenancy:
version_added: "1.9" version_added: "1.9"
description: description:
- An instance with a tenancy of "dedicated" runs on single-tenant hardware and can only be launched into a VPC. Valid values are "default" or "dedicated". Note that to use dedicated tenancy you MUST specify a vpc_subnet_id as well. Dedicated tenancy is not available for EC2 "micro" instances. - An instance with a tenancy of "dedicated" runs on single-tenant hardware and can only be launched into a VPC. Note that to use dedicated tenancy you MUST specify a vpc_subnet_id as well. Dedicated tenancy is not available for EC2 "micro" instances.
required: false required: false
default: default default: default
choices: [ "default", "dedicated" ]
aliases: [] aliases: []
spot_price: spot_price:
version_added: "1.5" version_added: "1.5"
@ -123,6 +124,7 @@ options:
- enable detailed monitoring (CloudWatch) for instance - enable detailed monitoring (CloudWatch) for instance
required: false required: false
default: null default: null
choices: [ "yes", "no" ]
aliases: [] aliases: []
user_data: user_data:
version_added: "0.9" version_added: "0.9"
@ -187,6 +189,7 @@ options:
- Enable or Disable the Source/Destination checks (for NAT instances and Virtual Routers) - Enable or Disable the Source/Destination checks (for NAT instances and Virtual Routers)
required: false required: false
default: true default: true
choices: [ "true", "false" ]
state: state:
version_added: "1.3" version_added: "1.3"
description: description:

Loading…
Cancel
Save