Skip to content

Commit 1f7f7c7

Browse files
committed
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.
1 parent 7dd9f57 commit 1f7f7c7

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

cloud/amazon/ec2.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
region:
4545
version_added: "1.2"
4646
description:
47-
- 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.
47+
- 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)
4848
required: false
4949
default: null
5050
aliases: [ 'aws_region', 'ec2_region' ]
@@ -57,16 +57,17 @@
5757
aliases: [ 'aws_zone', 'ec2_zone' ]
5858
instance_type:
5959
description:
60-
- instance type to use for the instance
60+
- instance type to use for the instance, see U(http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html)
6161
required: true
6262
default: null
6363
aliases: []
6464
tenancy:
6565
version_added: "1.9"
6666
description:
67-
- 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.
67+
- 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.
6868
required: false
6969
default: default
70+
choices: [ "default", "dedicated" ]
7071
aliases: []
7172
spot_price:
7273
version_added: "1.5"
@@ -123,6 +124,7 @@
123124
- enable detailed monitoring (CloudWatch) for instance
124125
required: false
125126
default: null
127+
choices: [ "yes", "no" ]
126128
aliases: []
127129
user_data:
128130
version_added: "0.9"
@@ -187,6 +189,7 @@
187189
- Enable or Disable the Source/Destination checks (for NAT instances and Virtual Routers)
188190
required: false
189191
default: true
192+
choices: [ "true", "false" ]
190193
state:
191194
version_added: "1.3"
192195
description:

0 commit comments

Comments
 (0)