Repository: incubator-brooklyn Updated Branches: refs/heads/master 7fbcf8488 -> 7b5c75495
add main uri Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/adf4cc09 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/adf4cc09 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/adf4cc09 Branch: refs/heads/master Commit: adf4cc0919bcc814dddfd75083f3af86adc20c36 Parents: e08d320 Author: andreaturli <[email protected]> Authored: Tue Mar 24 22:30:32 2015 +0100 Committer: andreaturli <[email protected]> Committed: Tue Mar 24 22:43:14 2015 +0100 ---------------------------------------------------------------------- .../entity/nosql/riak/RiakNodeSshDriver.java | 36 +++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/adf4cc09/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 544c39a..628b991 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 @@ -18,18 +18,31 @@ */ package brooklyn.entity.nosql.riak; -import static brooklyn.util.ssh.BashCommands.*; +import static brooklyn.util.ssh.BashCommands.INSTALL_CURL; +import static brooklyn.util.ssh.BashCommands.INSTALL_TAR; +import static brooklyn.util.ssh.BashCommands.addSbinPathCommand; +import static brooklyn.util.ssh.BashCommands.alternatives; +import static brooklyn.util.ssh.BashCommands.chainGroup; +import static brooklyn.util.ssh.BashCommands.commandToDownloadUrlAs; +import static brooklyn.util.ssh.BashCommands.ifExecutableElse; +import static brooklyn.util.ssh.BashCommands.ifNotExecutable; +import static brooklyn.util.ssh.BashCommands.ok; +import static brooklyn.util.ssh.BashCommands.sudo; import static java.lang.String.format; +import java.net.URI; import java.util.List; import java.util.Map; -import brooklyn.util.ssh.BashCommands; -import brooklyn.util.task.ssh.SshTasks; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.base.Joiner; +import com.google.common.base.Optional; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; + import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.Entities; @@ -40,15 +53,11 @@ import brooklyn.location.basic.SshMachineLocation; import brooklyn.util.collections.MutableMap; import brooklyn.util.net.Urls; import brooklyn.util.os.Os; +import brooklyn.util.ssh.BashCommands; import brooklyn.util.task.DynamicTasks; +import brooklyn.util.task.ssh.SshTasks; import brooklyn.util.text.Strings; -import com.google.common.base.Joiner; -import com.google.common.base.Optional; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; - // TODO: Alter -env ERL_CRASH_DUMP path in vm.args public class RiakNodeSshDriver extends AbstractSoftwareProcessSshDriver implements RiakNodeDriver { @@ -68,10 +77,10 @@ public class RiakNodeSshDriver extends AbstractSoftwareProcessSshDriver implemen @Override public Map<String, String> getShellEnvironment() { MutableMap<String, String> result = MutableMap.copyOf(super.getShellEnvironment()); - // how to change epmd port, according to + // how to change epmd port, according to // http://serverfault.com/questions/582787/how-to-change-listening-interface-of-rabbitmqs-epmd-port-4369 if (getEntity().getEpmdListenerPort() != null) { - result.put("ERL_EPMD_PORT", "" + Integer.toString(getEntity().getEpmdListenerPort())); + result.put("ERL_EPMD_PORT", Integer.toString(getEntity().getEpmdListenerPort())); } result.put("WAIT_FOR_ERLANG", "60"); return result; @@ -316,6 +325,9 @@ public class RiakNodeSshDriver extends AbstractSoftwareProcessSshDriver implemen launchScript.environmentVariablesReset(newPathVariable); } launchScript.failOnNonZeroResultCode().execute(); + + String mainUri = String.format("http://%s:%s/admin";, entity.getAttribute(Attributes.HOSTNAME), entity.getAttribute(RiakNode.RIAK_WEB_PORT)); + entity.setAttribute(Attributes.MAIN_URI, URI.create(mainUri)); } @Override
