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 <thomas.bou...@cloudsoftcorp.com> Authored: Thu Aug 30 13:19:14 2018 +0100 Committer: Thomas Bouron <thomas.bou...@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