Skip to content

Commit

Permalink
Change name of cluster entity to reference ECS and fix autoscaler config
Browse files Browse the repository at this point in the history
  • Loading branch information
grkvlt committed Oct 18, 2016
1 parent 15cdae8 commit 33f5c22
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions common/src/main/resources/docker/ecs.bom
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ brooklyn.catalog:
default: "clocker"

brooklyn.children:
- type: docker-cluster
id: docker-cluster
name: "docker-cluster"
- type: ecs-docker-cluster
id: ecs-docker-cluster
name: "ecs-docker-cluster"

- id: docker-cluster
name: "Docker Cluster"
- id: ecs-docker-cluster
name: "ECS Docker Cluster"
description: |
Creates a cluster of Docker engines, of configurable initial size, and
configures them for use with the Amazon EC2 comtainer service.
Expand Down Expand Up @@ -121,12 +121,11 @@ brooklyn.catalog:
$brooklyn:config("docker.max.size")
autoscaler.resizeUpStabilizationDelay: 30s
autoscaler.resizeDownIterationMax: 0 # Disable scaling down
autoscaler.resizeDownStabilizationDelay: forever

brooklyn.enrichers:
- type: org.apache.brooklyn.enricher.stock.Aggregator
brooklyn.config:
uniqueTag: docker-cluster-cpu-averageing
uniqueTag: ecs-docker-cluster-cpu-averageing
enricher.sourceSensor:
$brooklyn:sensor("org.apache.brooklyn.entity.machine.MachineAttributes", "machine.cpu")
enricher.targetSensor:
Expand Down

0 comments on commit 33f5c22

Please sign in to comment.