brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aleds...@apache.org
Subject [1/2] incubator-brooklyn git commit: Update brooklyn-node.yaml example
Date Wed, 15 Jul 2015 23:21:47 GMT
Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master 12625d82c -> dcf14dc21


Update brooklyn-node.yaml example


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

Branch: refs/heads/master
Commit: 84a5a7b5bc5f3da138a9514de3c8a7c9e2c92e56
Parents: 726bebc
Author: Valentin Aitken <valentin.aitken@cloudsoftcorp.com>
Authored: Tue Jul 14 19:07:11 2015 +0100
Committer: Valentin Aitken <valentin.aitken@cloudsoftcorp.com>
Committed: Tue Jul 14 19:48:39 2015 +0100

----------------------------------------------------------------------
 .../src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java | 3 +--
 .../resources/brooklyn/entity/brooklynnode/brooklyn-node.yaml    | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/84a5a7b5/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java
index ab696ba..669ac61 100644
--- a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java
+++ b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java
@@ -67,10 +67,9 @@ public interface BrooklynNode extends SoftwareProcess, UsesJava {
     @SetFromFlag("version")
     public static final ConfigKey<String> SUGGESTED_VERSION = ConfigKeys.newConfigKeyWithDefault(BrooklynConfigKeys.SUGGESTED_VERSION,
"0.8.0-SNAPSHOT"); // BROOKLYN_VERSION
 
-    // Takes precedence over downloadUrl, if non-null
     @SetFromFlag("distroUploadUrl")
     public static final ConfigKey<String> DISTRO_UPLOAD_URL = ConfigKeys.newStringConfigKey(
-            "brooklynnode.distro.uploadurl", "URL for uploading the brooklyn distro (retrieved
locally and pushed to remote install location)", null);
+            "brooklynnode.distro.uploadurl", "URL for uploading the brooklyn distro (retrieved
locally and pushed to remote install location. Takes precedence over downloadUrl, if non-null)",
null);
 
     // Note that download URL only supports versions in org.apache.brooklyn, so not 0.6.0
and earlier 
     // (which used maven group io.brooklyn). Aled thinks we can live with that.

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/84a5a7b5/software/base/src/main/resources/brooklyn/entity/brooklynnode/brooklyn-node.yaml
----------------------------------------------------------------------
diff --git a/software/base/src/main/resources/brooklyn/entity/brooklynnode/brooklyn-node.yaml
b/software/base/src/main/resources/brooklyn/entity/brooklynnode/brooklyn-node.yaml
index 89d4344..db5b1c7 100644
--- a/software/base/src/main/resources/brooklyn/entity/brooklynnode/brooklyn-node.yaml
+++ b/software/base/src/main/resources/brooklyn/entity/brooklynnode/brooklyn-node.yaml
@@ -22,8 +22,8 @@ name: Example Brooklyn Node
 services:
 - type: brooklyn.entity.brooklynnode.BrooklynNode
 
-  ## to use a local file, specify something such as the following:   [BROOKLYN_VERSION_BELOW]

-  # downloadUrl: file:///tmp/brooklyn-dist-0.8.0-SNAPSHOT-dist.tar.gz
+  ## URL for uploading the brooklyn distro (retrieved locally and pushed to remote install
location)
+  # brooklynnode.distro.uploadurl: file:///tmp/brooklyn-dist-<version>-dist.tar.gz
 
   ## if deploying to anything other than localhost you must also configure login details,
e.g.:
   # managementUsername: admin


Mime
View raw message