You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2014/11/04 15:42:33 UTC
[1/2] git commit: Changes missed when fixing Riak hostname and URL
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master d5636527a -> 9d56f01b7
Changes missed when fixing Riak hostname and URL
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d4c1af57
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d4c1af57
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d4c1af57
Branch: refs/heads/master
Commit: d4c1af57065426cf38182c04c7bfd3f37211b058
Parents: 83011fe
Author: Andrew Kennedy <gr...@apache.org>
Authored: Tue Nov 4 14:12:31 2014 +0000
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Tue Nov 4 14:12:31 2014 +0000
----------------------------------------------------------------------
.../java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java | 9 +--------
.../src/main/resources/brooklyn/entity/nosql/riak/riak.conf | 2 +-
2 files changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4c1af57/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java
index 42189f6..ef18659 100644
--- a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java
+++ b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java
@@ -44,14 +44,6 @@ import brooklyn.util.text.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-import java.util.Map;
-
-import static brooklyn.util.ssh.BashCommands.*;
-import static java.lang.String.format;
// TODO: Alter -env ERL_CRASH_DUMP path in vm.args
public class RiakNodeSshDriver extends AbstractSoftwareProcessSshDriver implements RiakNodeDriver {
@@ -78,6 +70,7 @@ public class RiakNodeSshDriver extends AbstractSoftwareProcessSshDriver implemen
if (getEntity().getEpmdListenerPort() != null) {
result.put("ERL_EPMD_PORT", "" + Integer.toString(getEntity().getEpmdListenerPort()));
}
+ result.put("WAIT_FOR_ERLANG", "60");
return result;
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4c1af57/software/nosql/src/main/resources/brooklyn/entity/nosql/riak/riak.conf
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/resources/brooklyn/entity/nosql/riak/riak.conf b/software/nosql/src/main/resources/brooklyn/entity/nosql/riak/riak.conf
index ec0ad30..1c96fc0 100644
--- a/software/nosql/src/main/resources/brooklyn/entity/nosql/riak/riak.conf
+++ b/software/nosql/src/main/resources/brooklyn/entity/nosql/riak/riak.conf
@@ -105,7 +105,7 @@ log.crash.rotation.keep = 5
##
## Acceptable values:
## - text
-nodename = riak@${driver.hostname}
+nodename = riak@${driver.subnetHostname}
## Cookie for distributed node communication. All nodes in the
## same cluster should use the same cookie or they will not be able to
[2/2] git commit: This closes #296
Posted by al...@apache.org.
This closes #296
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/9d56f01b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/9d56f01b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/9d56f01b
Branch: refs/heads/master
Commit: 9d56f01b7425657236f4f7e2d65d3e230ec2360c
Parents: d563652 d4c1af5
Author: Aled Sage <al...@gmail.com>
Authored: Tue Nov 4 14:42:20 2014 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Nov 4 14:42:20 2014 +0000
----------------------------------------------------------------------
.../java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java | 9 +--------
.../src/main/resources/brooklyn/entity/nosql/riak/riak.conf | 2 +-
2 files changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------