resilien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11338 from radeksimko/docs-aws-ecs-fix 

docs/aws: Fix misdocumented placement_strategy block
This commit is contained in:
Jake Champlin 2017-01-22 15:40:45 -05:00 committed by GitHub
parent d818fa4dbc 19335609bb
commit 5222c0f3b2
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
website/source/docs/providers/aws/r/ecs_service.html.markdown
View File

@ -56,8 +56,7 @@ The following arguments are supported:
* `deployment_minimum_healthy_percent` - (Optional) The lower limit (as a percentage of the service's desiredCount) of the number of running tasks that must remain running and healthy in a service during a deployment.
* `placement_strategy` - (Optional) Service level strategy rules that are taken
into consideration during task placement. The maximum number of
`placement_strategy` blocks is `5`. See [the related docs](http://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-placement-strategies.html) for
details on attributes.
`placement_strategy` blocks is `5`. Defined below.
* `load_balancer` - (Optional) A load balancer block. Load balancers documented below.
* `placement_constraints` - (Optional) rules that are taken into consideration during task placement. Maximum number of
`placement_constraints` is `10`. Defined below.
@ -71,6 +70,16 @@ Load balancers support the following:
* `container_name` - (Required) The name of the container to associate with the load balancer (as it appears in a container definition).
* `container_port` - (Required) The port on the container to associate with the load balancer.
## placement_strategy
`placement_strategy` supports the following:
* `type` - (Required) The type of placement strategy. Must be one of: `binpack`, `random`, or `spread`
* `field` - (Optional) For the `spread` placement strategy, valid values are instanceId (or host,
which has the same effect), or any platform or custom attribute that is applied to a container instance.
For the `binpack` type, valid values are `memory` and `cpu`. For the `random` type, this attribute is not
needed. For more information, see [Placement Strategy](http://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_PlacementStrategy.html).
## placement_constraints
`placement_constraints` support the following:

13
website/source/docs/providers/aws/r/ecs_task_definition.html.markdown
View File

@ -81,8 +81,6 @@ official [Developer Guide](https://docs.aws.amazon.com/AmazonECS/latest/develope
* `volume` - (Optional) A volume block. See below for details about what arguments are supported.
* `placement_constraints` - (Optional) rules that are taken into consideration during task placement. Maximum number of
`placement_constraints` is `10`. Defined below.
* `placement_strategy` - (Optional) an algorithm for selecting instances for task placement or tasks for termination. Maximum
number of `placement_strategy` blocks is `5`. Defined below.
Volume block supports the following arguments:
@ -101,17 +99,6 @@ For more information, see [Cluster Query Language in the Amazon EC2 Container
Service Developer
Guide](http://docs.aws.amazon.com/AmazonECS/latest/developerguide/cluster-query-language.html).
## placement_strategy
`placement_strategy` supports the following:
* `type` - (Required) The type of placement strategy. Must be one of: `binpack`, `random`, or `spread`
* `field` - (Optional) For the `spread` placement strategy, valid values are instanceId (or host,
which has the same effect), or any platform or custom attribute that is applied to a container instance.
For the `binpack` type, valid values are `memory` and `cpu`. For the `random` type, this attribute is not
needed. For more information, see [Placement Strategy](http://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_PlacementStrategy.html).
## Attributes Reference