brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aleds...@apache.org
Subject [1/4] incubator-brooklyn git commit: fixed byon syntax for catalog template examples
Date Thu, 17 Dec 2015 11:58:27 GMT
Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master 548eaba3c -> 85ff6afb0


fixed byon syntax for catalog template examples


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/0a86e295
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0a86e295
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0a86e295

Branch: refs/heads/master
Commit: 0a86e29578a9eff678430b857811313d674e6503
Parents: d58d503
Author: Murdo Aird <murdo.aird@gmail.com>
Authored: Fri Dec 11 21:33:43 2015 +0000
Committer: Murdo Aird <murdo.aird@gmail.com>
Committed: Fri Dec 11 21:33:43 2015 +0000

----------------------------------------------------------------------
 .../yaml/example_yaml/simple-appserver-with-location-byon.yaml     | 2 +-
 usage/cli/src/main/resources/brooklyn/default.catalog.bom          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0a86e295/docs/guide/yaml/example_yaml/simple-appserver-with-location-byon.yaml
----------------------------------------------------------------------
diff --git a/docs/guide/yaml/example_yaml/simple-appserver-with-location-byon.yaml b/docs/guide/yaml/example_yaml/simple-appserver-with-location-byon.yaml
index 633716f..8e9c951 100644
--- a/docs/guide/yaml/example_yaml/simple-appserver-with-location-byon.yaml
+++ b/docs/guide/yaml/example_yaml/simple-appserver-with-location-byon.yaml
@@ -9,4 +9,4 @@ location:
 services:
 - type: org.apache.brooklyn.entity.webapp.jboss.JBoss7Server
   location:
-    byon: { hosts: [ 127.0.0.1 ] }
+    byon:(hosts="127.0.0.1")

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0a86e295/usage/cli/src/main/resources/brooklyn/default.catalog.bom
----------------------------------------------------------------------
diff --git a/usage/cli/src/main/resources/brooklyn/default.catalog.bom b/usage/cli/src/main/resources/brooklyn/default.catalog.bom
index 9da223e..483f04d 100644
--- a/usage/cli/src/main/resources/brooklyn/default.catalog.bom
+++ b/usage/cli/src/main/resources/brooklyn/default.catalog.bom
@@ -60,7 +60,7 @@ brooklyn.catalog:
         name:           My VM
       
       # location can be e.g. `softlayer` or `jclouds:openstack-nova:https://9.9.9.9:9999/v2.0/`,
-      # or `localhost` or `byon: { nodes: [ 10.0.0.1, 10.0.0.2, 10.0.1.{1,2} ] }` 
+      # or `localhost` or `byon:(hosts="10.9.1.1,10.9.1.2,produser2@10.9.2.{10,11,20-29}")`

       location:
         jclouds:aws-ec2:
           # edit these to use your credential (or delete if credentials specified in brooklyn.properties)
     


Mime
View raw message