Skip to content

Commit cd04e3a

Browse files
committed
Add new Riak application and update Docker Cloud blueprints
1 parent 0d1f437 commit cd04e3a

File tree

3 files changed

+43
-5
lines changed

3 files changed

+43
-5
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ classes
2323

2424
*.log*
2525
obj
26-
26+
*.swp
2727
.DS_Store

examples/src/main/assembly/files/blueprints/docker-cloud.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,16 @@ services:
2222
install.version: "1.2"
2323
entity.dynamicLocation.name: "my-docker-cloud"
2424
docker.host.securityGroup: "docker"
25-
docker.host.cluster.initial.size: 1
25+
docker.host.cluster.initial.size: 2
2626
docker.host.register: false
2727
docker.policy.ha.enable: true
2828
docker.host.flags:
29-
minRam: 3000
30-
minCores: 2
29+
minRam: 8000
3130
docker.container.strategies:
3231
- $brooklyn:object:
3332
type: "brooklyn.location.docker.strategy.BreadthFirstPlacementStrategy"
3433
brooklyn.config:
35-
maxContainers: 16
34+
maxContainers: 8
3635
- $brooklyn:object:
3736
type: "brooklyn.location.docker.strategy.CpuUsagePlacementStrategy"
3837
brooklyn.config:
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Copyright 2014 by Cloudsoft Corporation Limited
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
id: riak-webapp-cluster
16+
name: Riak Cluster with Webapp Cluster
17+
locations:
18+
- my-docker-cloud
19+
origin: "https://github.com/apache/incubator-brooklyn/"
20+
services:
21+
- type: brooklyn.entity.nosql.riak.RiakCluster
22+
initialSize: 5
23+
id: cluster
24+
brooklyn.config:
25+
install.version: 2.0.0
26+
- type: brooklyn.entity.webapp.ControlledDynamicWebAppCluster
27+
name: Web Cluster
28+
brooklyn.config:
29+
initialSize: 3
30+
controlleddynamicwebappcluster.controllerSpec:
31+
$brooklyn:entitySpec:
32+
type: brooklyn.entity.proxy.nginx.NginxController
33+
brooklyn.config:
34+
member.sensor.hostname: $brooklyn:sensor("host.subnet.hostname")
35+
wars.root:
36+
"https://s3-eu-west-1.amazonaws.com/brooklyn-clocker/brooklyn-example-hello-world-sql-webapp.war"
37+
java.sysprops:
38+
brooklyn.example.riak.nodes:
39+
$brooklyn:component("cluster").attributeWhenReady("riak.cluster.nodeList")

0 commit comments

Comments
 (0)