Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into b/shared-ad-dns
Browse files Browse the repository at this point in the history
  • Loading branch information
jnvaldron-skillsoft committed Sep 10, 2021
2 parents 82f0136 + b8b7fee commit ec6d6da
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion website/docs/r/autoscaling_group.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ Note that if you suspend either the `Launch` or `Terminate` process types, it ca
Auto Scaling Group will not select instances with this setting for termination
during scale in events.
* `service_linked_role_arn` (Optional) The ARN of the service-linked role that the ASG will use to call other AWS services
* `max_instance_lifetime` (Optional) The maximum amount of time, in seconds, that an instance can be in service, values must be either equal to 0 or between 604800 and 31536000 seconds.
* `max_instance_lifetime` (Optional) The maximum amount of time, in seconds, that an instance can be in service. Values must be either equal to 0 or between 86400 and 31536000 seconds (inclusive). A value of 0 is used to remove a previously set value.
* `instance_refresh` - (Optional) If this block is configured, start an
[Instance Refresh](https://docs.aws.amazon.com/autoscaling/ec2/userguide/asg-instance-refresh.html)
when this Auto Scaling Group is updated. Defined [below](#instance_refresh).
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/launch_template.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ The metadata options for the instances.

The `metadata_options` block supports the following:

* `http_endpoint` - (Optional) Whether the metadata service is available. Can be `"enabled"` or `"disabled"`. (Default: `"enabled"`).
* `http_endpoint` - (Required) Whether the metadata service is available. Can be `"enabled"` or `"disabled"`.
* `http_tokens` - (Optional) Whether or not the metadata service requires session tokens, also referred to as _Instance Metadata Service Version 2 (IMDSv2)_. Can be `"optional"` or `"required"`. (Default: `"optional"`).
* `http_put_response_hop_limit` - (Optional) The desired HTTP PUT response hop limit for instance metadata requests. The larger the number, the further instance metadata requests can travel. Can be an integer from `1` to `64`. (Default: `1`).

Expand Down

0 comments on commit ec6d6da

Please sign in to comment.