You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by tb...@apache.org on 2018/08/30 12:19:46 UTC
[01/10] brooklyn-docs git commit: example_yaml: netcat client closes
connection after EOF
Repository: brooklyn-docs
Updated Branches:
refs/heads/master 740913fd6 -> 97515cbc7
example_yaml: netcat client closes connection after EOF
>From the nc(1) man page:
-N shutdown(2) the network socket after EOF on the input. Some servers
require this to finish their work.
Ubuntu would appear to be one such server.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/767a7160
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/767a7160
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/767a7160
Branch: refs/heads/master
Commit: 767a7160e1a032f56034fd19766f24a7e90617a2
Parents: d66451f
Author: Paul Campbell <pa...@cloudsoft.io>
Authored: Wed Aug 22 15:32:10 2018 +0100
Committer: Paul Campbell <pa...@cloudsoft.io>
Committed: Thu Aug 23 14:47:31 2018 +0100
----------------------------------------------------------------------
guide/blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/767a7160/guide/blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml b/guide/blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml
index 64377b2..3c65fc6 100644
--- a/guide/blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml
+++ b/guide/blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml
@@ -66,7 +66,7 @@ services:
name: sayHiNetcat
description: Echo a small hello string to the netcat entity
command: |
- echo $message | nc $TARGET_HOSTNAME 4321
+ echo $message | nc -N $TARGET_HOSTNAME 4321
parameters:
message:
description: The string to pass to netcat
[05/10] brooklyn-docs git commit: Quote jdbc string format templates
Posted by tb...@apache.org.
Quote jdbc string format templates
Ampersand (&) in format wasn't being parsed properly.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/845339d8
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/845339d8
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/845339d8
Branch: refs/heads/master
Commit: 845339d8cd4398aaa0f8463c52a1835071899c03
Parents: e8274fd
Author: Paul Campbell <pa...@cloudsoft.io>
Authored: Fri Aug 24 12:55:59 2018 +0100
Committer: Paul Campbell <pa...@cloudsoft.io>
Committed: Fri Aug 24 12:55:59 2018 +0100
----------------------------------------------------------------------
guide/blueprints/example_yaml/appserver-clustered-w-db.yaml | 2 +-
guide/blueprints/example_yaml/appserver-w-db-other-flavor.yaml | 2 +-
guide/blueprints/example_yaml/appserver-w-db.yaml | 2 +-
guide/blueprints/example_yaml/appserver-w-policy.yaml | 2 +-
guide/ops/externalized-configuration.md | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/845339d8/guide/blueprints/example_yaml/appserver-clustered-w-db.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/appserver-clustered-w-db.yaml b/guide/blueprints/example_yaml/appserver-clustered-w-db.yaml
index 46d55d6..8064a81 100644
--- a/guide/blueprints/example_yaml/appserver-clustered-w-db.yaml
+++ b/guide/blueprints/example_yaml/appserver-clustered-w-db.yaml
@@ -12,7 +12,7 @@ services:
java.sysprops:
brooklyn.example.db.url:
$brooklyn:formatString:
- - jdbc:%s%s?user=%s\\&password=%s
+ - "jdbc:%s%s?user=%s&password=%s"
- $brooklyn:component("db").attributeWhenReady("datastore.url")
- visitors
- brooklyn
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/845339d8/guide/blueprints/example_yaml/appserver-w-db-other-flavor.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/appserver-w-db-other-flavor.yaml b/guide/blueprints/example_yaml/appserver-w-db-other-flavor.yaml
index 2132a7e..1538683 100644
--- a/guide/blueprints/example_yaml/appserver-w-db-other-flavor.yaml
+++ b/guide/blueprints/example_yaml/appserver-w-db-other-flavor.yaml
@@ -8,7 +8,7 @@ services:
java.sysprops:
brooklyn.example.db.url:
$brooklyn:formatString:
- - jdbc:%s%s?user=%s\\&password=%s
+ - "jdbc:%s%s?user=%s&password=%s"
- $brooklyn:component("db").attributeWhenReady("datastore.url")
- visitors
- brooklyn
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/845339d8/guide/blueprints/example_yaml/appserver-w-db.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/appserver-w-db.yaml b/guide/blueprints/example_yaml/appserver-w-db.yaml
index 3555fcd..a54d88c 100644
--- a/guide/blueprints/example_yaml/appserver-w-db.yaml
+++ b/guide/blueprints/example_yaml/appserver-w-db.yaml
@@ -8,7 +8,7 @@ services:
java.sysprops:
brooklyn.example.db.url:
$brooklyn:formatString:
- - jdbc:%s%s?user=%s\\&password=%s
+ - "jdbc:%s%s?user=%s&password=%s"
- $brooklyn:component("db").attributeWhenReady("datastore.url")
- visitors
- brooklyn
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/845339d8/guide/blueprints/example_yaml/appserver-w-policy.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/appserver-w-policy.yaml b/guide/blueprints/example_yaml/appserver-w-policy.yaml
index 7c5315f..5106d9a 100644
--- a/guide/blueprints/example_yaml/appserver-w-policy.yaml
+++ b/guide/blueprints/example_yaml/appserver-w-policy.yaml
@@ -12,7 +12,7 @@ services:
java.sysprops:
brooklyn.example.db.url:
$brooklyn:formatString:
- - jdbc:%s%s?user=%s\\&password=%s
+ - "jdbc:%s%s?user=%s&password=%s"
- $brooklyn:component("db").attributeWhenReady("datastore.url")
- visitors
- brooklyn
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/845339d8/guide/ops/externalized-configuration.md
----------------------------------------------------------------------
diff --git a/guide/ops/externalized-configuration.md b/guide/ops/externalized-configuration.md
index 948c300..044b5ad 100644
--- a/guide/ops/externalized-configuration.md
+++ b/guide/ops/externalized-configuration.md
@@ -31,7 +31,7 @@ services:
java.sysprops:
brooklyn.example.db.url:
$brooklyn:formatString:
- - jdbc:postgresql://%s/myappdb?user=%s\\&password=%s
+ - "jdbc:postgresql://%s/myappdb?user=%s&password=%s"
- $brooklyn:external("servers", "postgresql")
- $brooklyn:external("credentials", "postgresql-user")
- $brooklyn:external("credentials", "postgresql-password")
[02/10] brooklyn-docs git commit: example_yaml: make start.sh
executable after extracting
Posted by tb...@apache.org.
example_yaml: make start.sh executable after extracting
/tmp/brooklyn-...-launching_VanillaSoftwareProce.sh:
line 9: ./start.sh: Permission denied
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/d66451f2
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/d66451f2
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/d66451f2
Branch: refs/heads/master
Commit: d66451f2c534f7964f8aac1d5cfa149adbe61487
Parents: d210db3
Author: Paul Campbell <pa...@cloudsoft.io>
Authored: Wed Aug 22 14:57:38 2018 +0100
Committer: Paul Campbell <pa...@cloudsoft.io>
Committed: Thu Aug 23 14:47:31 2018 +0100
----------------------------------------------------------------------
guide/blueprints/example_yaml/vanilla-bash-netcat-file.yaml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/d66451f2/guide/blueprints/example_yaml/vanilla-bash-netcat-file.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/vanilla-bash-netcat-file.yaml b/guide/blueprints/example_yaml/vanilla-bash-netcat-file.yaml
index 1c4612b..af9cf11 100644
--- a/guide/blueprints/example_yaml/vanilla-bash-netcat-file.yaml
+++ b/guide/blueprints/example_yaml/vanilla-bash-netcat-file.yaml
@@ -6,5 +6,6 @@ services:
brooklyn.config:
download.url: file:///tmp/netcat-server.tgz
launch.command: |
+ chmod +x start.sh
./start.sh &
echo $! > $PID_FILE
[10/10] brooklyn-docs git commit: This closes #266
Posted by tb...@apache.org.
This closes #266
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/97515cbc
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/97515cbc
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/97515cbc
Branch: refs/heads/master
Commit: 97515cbc7650e805042f6a515e80e5f80c6021b4
Parents: 740913f fbc27ca
Author: Thomas Bouron <th...@cloudsoftcorp.com>
Authored: Thu Aug 30 13:19:14 2018 +0100
Committer: Thomas Bouron <th...@cloudsoftcorp.com>
Committed: Thu Aug 30 13:19:14 2018 +0100
----------------------------------------------------------------------
guide/blueprints/entity-configuration.md | 80 ++------------------
.../appserver-clustered-w-db-concise.yaml | 2 +-
.../example_yaml/appserver-clustered-w-db.yaml | 4 +-
.../appserver-w-db-other-flavor.yaml | 4 +-
.../blueprints/example_yaml/appserver-w-db.yaml | 4 +-
.../example_yaml/appserver-w-policy.yaml | 4 +-
.../example_yaml/entity-config-app.yaml | 4 +
.../example_yaml/entity-config-catalog.yaml | 19 +++++
.../entity-config-override-app.yaml | 8 ++
.../example_yaml/entity-constraint-app.yaml | 7 ++
.../example_yaml/entity-constraint-catalog.yaml | 29 +++++++
.../fabric-with-multiple-locations.yaml | 2 +-
.../example_yaml/vanilla-bash-netcat-file.yaml | 1 +
.../vanilla-bash-netcat-w-client.yaml | 6 +-
.../testcases/getting-started-test-example.yaml | 2 +-
guide/ops/cli/cli-usage-guide.md | 20 ++---
guide/ops/externalized-configuration.md | 2 +-
guide/ops/gui/_my-web-cluster.yaml | 2 +-
guide/ops/gui/_my-web-cluster2.yaml | 2 +-
guide/start/_my-web-cluster.yaml | 2 +-
guide/start/_my-web-cluster2.yaml | 2 +-
21 files changed, 104 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/97515cbc/guide/blueprints/entity-configuration.md
----------------------------------------------------------------------
diff --cc guide/blueprints/entity-configuration.md
index cf38a1b,1b623c6..1bd1db1
--- a/guide/blueprints/entity-configuration.md
+++ b/guide/blueprints/entity-configuration.md
@@@ -67,14 -47,9 +47,10 @@@ Once added to the catalog, it can be us
of your choice). Because no configuration has been overridden, this will use the default value
for `custom.message`, and will use the given values for `launch.command` and `checkRunning.command`:
- ```yaml
- location: aws-ec2:us-east-1
- services:
- - type: entity-config-example
- ```
+ !CODEFILE "example_yaml/entity-config-app.yaml"
-For details of how to write and add catalog items, see [Catalog]({{book.path.docs}}/blueprints/catalog/index.md).
+For details of how to write and add catalog items, see [Catalog]({{book.path.docs}}/blueprints/catalog/index.md),
+and for a complete reference on the syntax of `brooklyn.parameters` see that section of the [YAML Reference]({{book.path.docs}}/blueprints/yaml-reference.md).
#### Config Key Constraints
[06/10] brooklyn-docs git commit: Extract Entity Config example to
YAML file
Posted by tb...@apache.org.
Extract Entity Config example to YAML file
Added a name for the deployed application.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/46fc3814
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/46fc3814
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/46fc3814
Branch: refs/heads/master
Commit: 46fc3814dcb634ebd34afd298554feae33c15309
Parents: 845339d
Author: Paul Campbell <pa...@cloudsoft.io>
Authored: Fri Aug 24 13:59:40 2018 +0100
Committer: Paul Campbell <pa...@cloudsoft.io>
Committed: Fri Aug 24 14:30:38 2018 +0100
----------------------------------------------------------------------
guide/blueprints/entity-configuration.md | 28 ++------------------
.../example_yaml/entity-config-app.yaml | 4 +++
.../example_yaml/entity-config-catalog.yaml | 19 +++++++++++++
3 files changed, 25 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/46fc3814/guide/blueprints/entity-configuration.md
----------------------------------------------------------------------
diff --git a/guide/blueprints/entity-configuration.md b/guide/blueprints/entity-configuration.md
index 9b5dd2a..cefea27 100644
--- a/guide/blueprints/entity-configuration.md
+++ b/guide/blueprints/entity-configuration.md
@@ -41,37 +41,13 @@ blueprint (i.e. inside the `brooklyn.config` block).
It can also explicitly declare config keys, using the `brooklyn.parameters` block. The example
below illustrates the principle:
-```yaml
-brooklyn.catalog:
- items:
- - id: entity-config-example
- itemType: entity
- name: Entity Config Example
- item:
- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess
- brooklyn.parameters:
- - name: custom.message
- type: string
- description: Message to be displayed
- default: Hello
- brooklyn.config:
- shell.env:
- MESSAGE: $brooklyn:config("custom.message")
- launch.command: |
- echo "My example launch command: $MESSAGE"
- checkRunning.command: |
- echo "My example checkRunning command: $MESSAGE"
-```
+!CODEFILE "example_yaml/entity-config-catalog.yaml"
Once added to the catalog, it can be used with the simple blueprint below (substituting the location
of your choice). Because no configuration has been overridden, this will use the default value
for `custom.message`, and will use the given values for `launch.command` and `checkRunning.command`:
-```yaml
-location: aws-ec2:us-east-1
-services:
-- type: entity-config-example
-```
+!CODEFILE "example_yaml/entity-config-app.yaml"
For details of how to write and add catalog items, see [Catalog]({{book.path.docs}}/blueprints/catalog/index.md).
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/46fc3814/guide/blueprints/example_yaml/entity-config-app.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/entity-config-app.yaml b/guide/blueprints/example_yaml/entity-config-app.yaml
new file mode 100644
index 0000000..526b3d3
--- /dev/null
+++ b/guide/blueprints/example_yaml/entity-config-app.yaml
@@ -0,0 +1,4 @@
+location: aws-ec2:us-east-1
+name: entity-config-example
+services:
+- type: entity-config-example
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/46fc3814/guide/blueprints/example_yaml/entity-config-catalog.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/entity-config-catalog.yaml b/guide/blueprints/example_yaml/entity-config-catalog.yaml
new file mode 100644
index 0000000..fe726c2
--- /dev/null
+++ b/guide/blueprints/example_yaml/entity-config-catalog.yaml
@@ -0,0 +1,19 @@
+brooklyn.catalog:
+ items:
+ - id: entity-config-example
+ itemType: entity
+ name: Entity Config Example
+ item:
+ type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess
+ brooklyn.parameters:
+ - name: custom.message
+ type: string
+ description: Message to be displayed
+ default: Hello
+ brooklyn.config:
+ shell.env:
+ MESSAGE: $brooklyn:config("custom.message")
+ launch.command: |
+ echo "My example launch command: $MESSAGE"
+ checkRunning.command: |
+ echo "My example checkRunning command: $MESSAGE"
[03/10] brooklyn-docs git commit: Update to use
datastore.creation.script.template.url
Posted by tb...@apache.org.
Update to use datastore.creation.script.template.url
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/c0aaf80f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/c0aaf80f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/c0aaf80f
Branch: refs/heads/master
Commit: c0aaf80f12e0c284c804eb618805221dc5d03d13
Parents: 767a716
Author: Paul Campbell <pa...@cloudsoft.io>
Authored: Fri Aug 24 12:50:16 2018 +0100
Committer: Paul Campbell <pa...@cloudsoft.io>
Committed: Fri Aug 24 12:50:16 2018 +0100
----------------------------------------------------------------------
.../appserver-clustered-w-db-concise.yaml | 2 +-
.../example_yaml/appserver-clustered-w-db.yaml | 2 +-
.../appserver-w-db-other-flavor.yaml | 2 +-
.../blueprints/example_yaml/appserver-w-db.yaml | 2 +-
.../example_yaml/appserver-w-policy.yaml | 2 +-
.../testcases/getting-started-test-example.yaml | 2 +-
guide/ops/cli/cli-usage-guide.md | 20 ++++++++++----------
guide/ops/gui/_my-web-cluster.yaml | 2 +-
guide/ops/gui/_my-web-cluster2.yaml | 2 +-
guide/start/_my-web-cluster.yaml | 2 +-
guide/start/_my-web-cluster2.yaml | 2 +-
11 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/c0aaf80f/guide/blueprints/example_yaml/appserver-clustered-w-db-concise.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/appserver-clustered-w-db-concise.yaml b/guide/blueprints/example_yaml/appserver-clustered-w-db-concise.yaml
index f4176fa..24b3682 100644
--- a/guide/blueprints/example_yaml/appserver-clustered-w-db-concise.yaml
+++ b/guide/blueprints/example_yaml/appserver-clustered-w-db-concise.yaml
@@ -12,4 +12,4 @@ services:
name: DB HelloWorld Visitors
brooklyn.config:
creation.script.password: $brooklyn:external("brooklyn-demo-sample", "hidden-brooklyn-password")
- datastore.creation.script.url: https://github.com/apache/brooklyn-library/blob/master/examples/simple-web-cluster/src/main/resources/visitors-creation-script.sql
+ datastore.creation.script.template.url: https://github.com/apache/brooklyn-library/blob/master/examples/simple-web-cluster/src/main/resources/visitors-creation-script.sql
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/c0aaf80f/guide/blueprints/example_yaml/appserver-clustered-w-db.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/appserver-clustered-w-db.yaml b/guide/blueprints/example_yaml/appserver-clustered-w-db.yaml
index 024cc4d..46d55d6 100644
--- a/guide/blueprints/example_yaml/appserver-clustered-w-db.yaml
+++ b/guide/blueprints/example_yaml/appserver-clustered-w-db.yaml
@@ -22,5 +22,5 @@ services:
name: DB HelloWorld Visitors
brooklyn.config:
creation.script.password: $brooklyn:external("brooklyn-demo-sample", "hidden-brooklyn-password")
- datastore.creation.script.url: https://github.com/apache/brooklyn-library/blob/master/examples/simple-web-cluster/src/main/resources/visitors-creation-script.sql
+ datastore.creation.script.template.url: https://github.com/apache/brooklyn-library/blob/master/examples/simple-web-cluster/src/main/resources/visitors-creation-script.sql
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/c0aaf80f/guide/blueprints/example_yaml/appserver-w-db-other-flavor.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/appserver-w-db-other-flavor.yaml b/guide/blueprints/example_yaml/appserver-w-db-other-flavor.yaml
index fe4013c..2132a7e 100644
--- a/guide/blueprints/example_yaml/appserver-w-db-other-flavor.yaml
+++ b/guide/blueprints/example_yaml/appserver-w-db-other-flavor.yaml
@@ -18,6 +18,6 @@ services:
name: DB HelloWorld Visitors
brooklyn.config:
creation.script.password: $brooklyn:external("brooklyn-demo-sample", "hidden-brooklyn-password")
- datastore.creation.script.url: https://github.com/apache/brooklyn-library/raw/master/examples/simple-web-cluster/src/main/resources/visitors-creation-script.sql
+ datastore.creation.script.template.url: https://github.com/apache/brooklyn-library/raw/master/examples/simple-web-cluster/src/main/resources/visitors-creation-script.sql
provisioning.properties:
minRam: 8192
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/c0aaf80f/guide/blueprints/example_yaml/appserver-w-db.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/appserver-w-db.yaml b/guide/blueprints/example_yaml/appserver-w-db.yaml
index 5510ba7..3555fcd 100644
--- a/guide/blueprints/example_yaml/appserver-w-db.yaml
+++ b/guide/blueprints/example_yaml/appserver-w-db.yaml
@@ -18,4 +18,4 @@ services:
name: DB HelloWorld Visitors
brooklyn.config:
creation.script.password: $brooklyn:external("brooklyn-demo-sample", "hidden-brooklyn-password")
- datastore.creation.script.url: https://github.com/apache/brooklyn-library/raw/master/examples/simple-web-cluster/src/main/resources/visitors-creation-script.sql
+ datastore.creation.script.template.url: https://github.com/apache/brooklyn-library/raw/master/examples/simple-web-cluster/src/main/resources/visitors-creation-script.sql
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/c0aaf80f/guide/blueprints/example_yaml/appserver-w-policy.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/appserver-w-policy.yaml b/guide/blueprints/example_yaml/appserver-w-policy.yaml
index 6ebe087..7c5315f 100644
--- a/guide/blueprints/example_yaml/appserver-w-policy.yaml
+++ b/guide/blueprints/example_yaml/appserver-w-policy.yaml
@@ -30,4 +30,4 @@ services:
name: DB HelloWorld Visitors
brooklyn.config:
creation.script.password: $brooklyn:external("brooklyn-demo-sample", "hidden-brooklyn-password")
- datastore.creation.script.url: https://github.com/apache/brooklyn-library/raw/master/examples/simple-web-cluster/src/main/resources/visitors-creation-script.sql
+ datastore.creation.script.template.url: https://github.com/apache/brooklyn-library/raw/master/examples/simple-web-cluster/src/main/resources/visitors-creation-script.sql
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/c0aaf80f/guide/blueprints/test/example_yaml/testcases/getting-started-test-example.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/test/example_yaml/testcases/getting-started-test-example.yaml b/guide/blueprints/test/example_yaml/testcases/getting-started-test-example.yaml
index 788dabf..4a77255 100644
--- a/guide/blueprints/test/example_yaml/testcases/getting-started-test-example.yaml
+++ b/guide/blueprints/test/example_yaml/testcases/getting-started-test-example.yaml
@@ -21,7 +21,7 @@ services:
name: My DB
brooklyn.config:
creation.script.password: $brooklyn:external("brooklyn-demo-sample", "hidden-brooklyn-password")
- datastore.creation.script.url: https://bit.ly/brooklyn-visitors-creation-script
+ datastore.creation.script.template.url: https://bit.ly/brooklyn-visitors-creation-script
- type: org.apache.brooklyn.test.framework.TestHttpCall
name: Check HTTP Response Status Code
brooklyn.config:
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/c0aaf80f/guide/ops/cli/cli-usage-guide.md
----------------------------------------------------------------------
diff --git a/guide/ops/cli/cli-usage-guide.md b/guide/ops/cli/cli-usage-guide.md
index f6fcd84..c5c18db 100644
--- a/guide/ops/cli/cli-usage-guide.md
+++ b/guide/ops/cli/cli-usage-guide.md
@@ -109,14 +109,14 @@ command:
```text
$ br app WebCluster entity thHnLFkP config
-Key Value
-install.unique_label MySqlNode_5.6.26
-brooklyn.wrapper_app true
-datastore.creation.script.url https://bit.ly/brooklyn-visitors-creation-script
-camp.template.id dnw3GqN0
-camp.plan.id db
-onbox.base.dir /home/vagrant/brooklyn-managed-processes
-onbox.base.dir.resolved true
+Key Value
+install.unique_label MySqlNode_5.6.26
+brooklyn.wrapper_app true
+datastore.creation.script.template.url https://bit.ly/brooklyn-visitors-creation-script
+camp.template.id dnw3GqN0
+camp.plan.id db
+onbox.base.dir /home/vagrant/brooklyn-managed-processes
+onbox.base.dir.resolved true
```
@@ -124,14 +124,14 @@ The value of a single configuration item can be displayed by using the configura
as a parameter for the `config` command:
```text
-$ br app WebCluster entity thHnLFkP config datastore.creation.script.url
+$ br app WebCluster entity thHnLFkP config datastore.creation.script.template.url
https://bit.ly/brooklyn-visitors-creation-script
```
The value of a configuration item can be changed by using the `set` command:
```text
-$ br app WebCluster entity thHnLFkP config datastore.creation.script.url set \"https://bit.ly/new-script\"
+$ br app WebCluster entity thHnLFkP config datastore.creation.script.template.url set \"https://bit.ly/new-script\"
```
## Sensors
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/c0aaf80f/guide/ops/gui/_my-web-cluster.yaml
----------------------------------------------------------------------
diff --git a/guide/ops/gui/_my-web-cluster.yaml b/guide/ops/gui/_my-web-cluster.yaml
index 65e01c1..9ec2674 100644
--- a/guide/ops/gui/_my-web-cluster.yaml
+++ b/guide/ops/gui/_my-web-cluster.yaml
@@ -21,4 +21,4 @@ services:
id: db
brooklyn.config:
creation.script.password: $brooklyn:external("brooklyn-demo-sample", "hidden-brooklyn-password")
- datastore.creation.script.url: https://bit.ly/brooklyn-visitors-creation-script
\ No newline at end of file
+ datastore.creation.script.template.url: https://bit.ly/brooklyn-visitors-creation-script
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/c0aaf80f/guide/ops/gui/_my-web-cluster2.yaml
----------------------------------------------------------------------
diff --git a/guide/ops/gui/_my-web-cluster2.yaml b/guide/ops/gui/_my-web-cluster2.yaml
index fd0fef5..165c7b1 100644
--- a/guide/ops/gui/_my-web-cluster2.yaml
+++ b/guide/ops/gui/_my-web-cluster2.yaml
@@ -29,4 +29,4 @@ services:
name: My DB
brooklyn.config:
creation.script.password: $brooklyn:external("brooklyn-demo-sample", "hidden-brooklyn-password")
- datastore.creation.script.url: https://bit.ly/brooklyn-visitors-creation-script
+ datastore.creation.script.template.url: https://bit.ly/brooklyn-visitors-creation-script
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/c0aaf80f/guide/start/_my-web-cluster.yaml
----------------------------------------------------------------------
diff --git a/guide/start/_my-web-cluster.yaml b/guide/start/_my-web-cluster.yaml
index 6cccedd..e79a88a 100644
--- a/guide/start/_my-web-cluster.yaml
+++ b/guide/start/_my-web-cluster.yaml
@@ -21,4 +21,4 @@ services:
id: db
brooklyn.config:
creation.script.password: $brooklyn:external("brooklyn-demo-sample", "hidden-brooklyn-password")
- datastore.creation.script.url: https://bit.ly/brooklyn-visitors-creation-script
+ datastore.creation.script.template.url: https://bit.ly/brooklyn-visitors-creation-script
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/c0aaf80f/guide/start/_my-web-cluster2.yaml
----------------------------------------------------------------------
diff --git a/guide/start/_my-web-cluster2.yaml b/guide/start/_my-web-cluster2.yaml
index fd0fef5..165c7b1 100644
--- a/guide/start/_my-web-cluster2.yaml
+++ b/guide/start/_my-web-cluster2.yaml
@@ -29,4 +29,4 @@ services:
name: My DB
brooklyn.config:
creation.script.password: $brooklyn:external("brooklyn-demo-sample", "hidden-brooklyn-password")
- datastore.creation.script.url: https://bit.ly/brooklyn-visitors-creation-script
+ datastore.creation.script.template.url: https://bit.ly/brooklyn-visitors-creation-script
[08/10] brooklyn-docs git commit: Extract Entity Config Override
example to YAML file
Posted by tb...@apache.org.
Extract Entity Config Override example to YAML file
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/ca1cd3f6
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/ca1cd3f6
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/ca1cd3f6
Branch: refs/heads/master
Commit: ca1cd3f6f52d752ec5cdf92af714050d14d8e4a0
Parents: 37d8433
Author: Paul Campbell <pa...@cloudsoft.io>
Authored: Fri Aug 24 15:53:45 2018 +0100
Committer: Paul Campbell <pa...@cloudsoft.io>
Committed: Fri Aug 24 15:53:45 2018 +0100
----------------------------------------------------------------------
guide/blueprints/entity-configuration.md | 11 +----------
.../example_yaml/entity-config-override-app.yaml | 8 ++++++++
2 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/ca1cd3f6/guide/blueprints/entity-configuration.md
----------------------------------------------------------------------
diff --git a/guide/blueprints/entity-configuration.md b/guide/blueprints/entity-configuration.md
index 96885ca..1b623c6 100644
--- a/guide/blueprints/entity-configuration.md
+++ b/guide/blueprints/entity-configuration.md
@@ -103,16 +103,7 @@ consider the `entity-config-example` added to the catalog in the section
[Configuration in a Catalog Item](#configuration-in-a-catalog-item).
We can override these values. If not overridden, then the existing values from the super-type will be used:
-```yaml
-location: aws-ec2:us-east-1
-services:
-- type: entity-config-example
- brooklyn.config:
- custom.message: Goodbye
- launch.command: |
- echo "Sub-type launch command: $MESSAGE"
-```
-
+!CODEFILE "example_yaml/entity-config-override-app.yaml"
In this example, the `custom.message` overrides the default defined on the config key.
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/ca1cd3f6/guide/blueprints/example_yaml/entity-config-override-app.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/entity-config-override-app.yaml b/guide/blueprints/example_yaml/entity-config-override-app.yaml
new file mode 100644
index 0000000..a1481f0
--- /dev/null
+++ b/guide/blueprints/example_yaml/entity-config-override-app.yaml
@@ -0,0 +1,8 @@
+location: aws-ec2:us-east-1
+name: entity-config-override-example
+services:
+- type: entity-config-example
+ brooklyn.config:
+ custom.message: Goodbye
+ launch.command: |
+ echo "Sub-type launch command: $MESSAGE"
[09/10] brooklyn-docs git commit: Comment on netcat command for
macos/linux compatibility
Posted by tb...@apache.org.
Comment on netcat command for macos/linux compatibility
The version of netcat on MacOS doesn't support, or need, the `-N` parameter.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/fbc27ca5
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/fbc27ca5
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/fbc27ca5
Branch: refs/heads/master
Commit: fbc27ca599179377e1710bdc5a0a7f15b1e13d1b
Parents: ca1cd3f
Author: Paul Campbell <pa...@cloudsoft.io>
Authored: Thu Aug 30 11:18:56 2018 +0100
Committer: Paul Campbell <pa...@cloudsoft.io>
Committed: Thu Aug 30 11:18:56 2018 +0100
----------------------------------------------------------------------
.../blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/fbc27ca5/guide/blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml b/guide/blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml
index 3c65fc6..651e2b0 100644
--- a/guide/blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml
+++ b/guide/blueprints/example_yaml/vanilla-bash-netcat-w-client.yaml
@@ -66,7 +66,11 @@ services:
name: sayHiNetcat
description: Echo a small hello string to the netcat entity
command: |
- echo $message | nc -N $TARGET_HOSTNAME 4321
+ # Uncomment the appropriate command for your operating system
+ # for Linux:
+ # echo $message | nc -N $TARGET_HOSTNAME 4321
+ # for MacOS:
+ # echo $message | nc $TARGET_HOSTNAME 4321
parameters:
message:
description: The string to pass to netcat
[07/10] brooklyn-docs git commit: Extract Entity Constraint example
to YAML file
Posted by tb...@apache.org.
Extract Entity Constraint example to YAML file
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/37d84333
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/37d84333
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/37d84333
Branch: refs/heads/master
Commit: 37d84333e40041c16efa64d14b47aac14eb0e071
Parents: 46fc381
Author: Paul Campbell <pa...@cloudsoft.io>
Authored: Fri Aug 24 14:30:58 2018 +0100
Committer: Paul Campbell <pa...@cloudsoft.io>
Committed: Fri Aug 24 14:33:06 2018 +0100
----------------------------------------------------------------------
guide/blueprints/entity-configuration.md | 41 +-------------------
.../example_yaml/entity-constraint-app.yaml | 7 ++++
.../example_yaml/entity-constraint-catalog.yaml | 29 ++++++++++++++
3 files changed, 38 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/37d84333/guide/blueprints/entity-configuration.md
----------------------------------------------------------------------
diff --git a/guide/blueprints/entity-configuration.md b/guide/blueprints/entity-configuration.md
index cefea27..96885ca 100644
--- a/guide/blueprints/entity-configuration.md
+++ b/guide/blueprints/entity-configuration.md
@@ -64,48 +64,11 @@ can be any of:
This is illustrated in the example below:
-```yaml
-brooklyn.catalog:
- items:
- - id: entity-constraint-example
- itemType: entity
- name: Entity Config Example
- item:
- type: org.apache.brooklyn.entity.stock.BasicEntity
- brooklyn.parameters:
- - name: compulsoryExample
- type: string
- constraints:
- - required
- - name: addressExample
- type: string
- constraints:
- - regex: ^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$
- - name: numberExample
- type: double
- constraints:
- - $brooklyn:object:
- type: org.apache.brooklyn.util.math.MathPredicates
- factoryMethod.name: greaterThan
- factoryMethod.args:
- - 0.0
- - $brooklyn:object:
- type: org.apache.brooklyn.util.math.MathPredicates
- factoryMethod.name: lessThan
- factoryMethod.args:
- - 256.0
-```
+!CODEFILE "example_yaml/entity-constraint-catalog.yaml"
An example usage of this toy example, once added to the catalog, is shown below:
-```yaml
-services:
-- type: entity-constraint-example
- brooklyn.config:
- compulsoryExample: foo
- addressExample: 1.1.1.1
- numberExample: 2.0
-```
+!CODEFILE "example_yaml/entity-constraint-app.yaml"
### Inheriting Configuration
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/37d84333/guide/blueprints/example_yaml/entity-constraint-app.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/entity-constraint-app.yaml b/guide/blueprints/example_yaml/entity-constraint-app.yaml
new file mode 100644
index 0000000..a75d2ca
--- /dev/null
+++ b/guide/blueprints/example_yaml/entity-constraint-app.yaml
@@ -0,0 +1,7 @@
+name: entity-constraint-example
+services:
+- type: entity-constraint-example
+ brooklyn.config:
+ compulsoryExample: foo
+ addressExample: 1.1.1.1
+ numberExample: 2.0
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/37d84333/guide/blueprints/example_yaml/entity-constraint-catalog.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/entity-constraint-catalog.yaml b/guide/blueprints/example_yaml/entity-constraint-catalog.yaml
new file mode 100644
index 0000000..d957a09
--- /dev/null
+++ b/guide/blueprints/example_yaml/entity-constraint-catalog.yaml
@@ -0,0 +1,29 @@
+brooklyn.catalog:
+ items:
+ - id: entity-constraint-example
+ itemType: entity
+ name: Entity Config Example
+ item:
+ type: org.apache.brooklyn.entity.stock.BasicEntity
+ brooklyn.parameters:
+ - name: compulsoryExample
+ type: string
+ constraints:
+ - required
+ - name: addressExample
+ type: string
+ constraints:
+ - regex: ^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$
+ - name: numberExample
+ type: double
+ constraints:
+ - $brooklyn:object:
+ type: org.apache.brooklyn.util.math.MathPredicates
+ factoryMethod.name: greaterThan
+ factoryMethod.args:
+ - 0.0
+ - $brooklyn:object:
+ type: org.apache.brooklyn.util.math.MathPredicates
+ factoryMethod.name: lessThan
+ factoryMethod.args:
+ - 256.0
[04/10] brooklyn-docs git commit: Fix typo in example yaml for
dynamicfabric
Posted by tb...@apache.org.
Fix typo in example yaml for dynamicfabric
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/e8274fdd
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/e8274fdd
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/e8274fdd
Branch: refs/heads/master
Commit: e8274fddc603dadbba6cf7933d76eb6a0bfcdd4c
Parents: c0aaf80
Author: Paul Campbell <pa...@cloudsoft.io>
Authored: Fri Aug 24 12:51:56 2018 +0100
Committer: Paul Campbell <pa...@cloudsoft.io>
Committed: Fri Aug 24 12:51:56 2018 +0100
----------------------------------------------------------------------
guide/blueprints/example_yaml/fabric-with-multiple-locations.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e8274fdd/guide/blueprints/example_yaml/fabric-with-multiple-locations.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/fabric-with-multiple-locations.yaml b/guide/blueprints/example_yaml/fabric-with-multiple-locations.yaml
index 7a2a14f..4fef1f8 100644
--- a/guide/blueprints/example_yaml/fabric-with-multiple-locations.yaml
+++ b/guide/blueprints/example_yaml/fabric-with-multiple-locations.yaml
@@ -5,7 +5,7 @@ locations:
services:
- type: org.apache.brooklyn.entity.group.DynamicFabric
brooklyn.config:
- dynamiccfabric.memberspec:
+ dynamicfabric.memberspec:
$brooklyn:entitySpec:
type: org.apache.brooklyn.entity.group.DynamicCluster
brooklyn.config: