You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/24 19:56:48 UTC
[6/9] brooklyn-docs git commit: Update index.md
Update index.md
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/3b125245
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/3b125245
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/3b125245
Branch: refs/heads/master
Commit: 3b125245ed33d0e69d7c8b8d176d7812aaa3eb19
Parents: 26de35f
Author: drigodwin <dr...@googlemail.com>
Authored: Wed Feb 24 09:46:15 2016 +0000
Committer: drigodwin <dr...@googlemail.com>
Committed: Wed Feb 24 09:46:15 2016 +0000
----------------------------------------------------------------------
guide/ops/catalog/index.md | 56 +++++++++++++++++++++--------------------
1 file changed, 29 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/3b125245/guide/ops/catalog/index.md
----------------------------------------------------------------------
diff --git a/guide/ops/catalog/index.md b/guide/ops/catalog/index.md
index 5ba4396..d5e7d4a 100644
--- a/guide/ops/catalog/index.md
+++ b/guide/ops/catalog/index.md
@@ -126,33 +126,6 @@ The following optional catalog metadata is supported:
and if entities have been deployed against that version, their behavior may change in subtle or potentially incompatible ways.
To avoid this situation, it is highly recommended to use OSGi version stamps as part of the URL.
-#### Locations in Catalog
-
-In addition to blueprints, locations can be stored in the Apache Brooklyn catalog. The example below shows a location for the vagrant configuration used in the [getting started guide]({{ site.path.guide }}/start/blueprints.html), formatted as a catalog entry.
-
-~~~ yaml
-brooklyn.catalog:
- id: vagrant
- version: 1.0
- itemType: location
- name: Vagrant getting started location
- item:
- type: byon
- brooklyn.config:
- user: vagrant
- password: vagrant
- hosts:
- - 10.10.10.101
- - 10.10.10.102
- - 10.10.10.103
- - 10.10.10.104
-~~~
-
-Once this has been added to the catalog it can be used as a named location in yaml blueprints using:
-
-~~~ yaml
-location: vagrant
-~~~
#### Catalog YAML Examples
@@ -227,6 +200,35 @@ The items this will install are:
(This must be supplied after `riak-cluster`, because it refers to `riak-cluster`.)
+#### Locations in the Catalog
+
+In addition to blueprints, locations can be added to the Apache Brooklyn catalog. The example below shows a location for the vagrant configuration used in the [getting started guide]({{ site.path.guide }}/start/blueprints.html), formatted as a catalog entry.
+
+~~~ yaml
+brooklyn.catalog:
+ id: vagrant
+ version: 1.0
+ itemType: location
+ name: Vagrant getting started location
+ item:
+ type: byon
+ brooklyn.config:
+ user: vagrant
+ password: vagrant
+ hosts:
+ - 10.10.10.101
+ - 10.10.10.102
+ - 10.10.10.103
+ - 10.10.10.104
+~~~
+
+Once this has been added to the catalog it can be used as a named location in yaml blueprints using:
+
+~~~ yaml
+location: vagrant
+~~~
+
+
#### Legacy Syntax
The following legacy and experimental syntax is also supported: