Riak Linux - Add versioning support for the default Linux installations from packagecloud
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/6b0af953 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/6b0af953 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/6b0af953 Branch: refs/heads/master Commit: 6b0af9530619682a4e96728063e384d061a1f053 Parents: bddb431 Author: Valentin Aitken <[email protected]> Authored: Sun Mar 15 02:45:21 2015 +0200 Committer: Valentin Aitken <[email protected]> Committed: Sun Mar 15 02:45:21 2015 +0200 ---------------------------------------------------------------------- .../nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java | 3 ++- .../main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6b0af953/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java index 0dbc833..ef9556d 100644 --- a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java +++ b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java @@ -45,7 +45,8 @@ public interface RiakNode extends SoftwareProcess { @SetFromFlag("version") ConfigKey<String> SUGGESTED_VERSION = ConfigKeys.newConfigKeyWithDefault(SoftwareProcess.SUGGESTED_VERSION, - "2.0.2"); + "Version to install. Example 2.0.2, 2.0.5", + "2.0.5"); // vm.args and app.config are used for pre-version 2.0.0. Later versions use the (simplified) riak.conf // see https://github.com/joedevivo/ricon/blob/master/cuttlefish.md http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6b0af953/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 37ddc1f..f1d2465 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 @@ -190,14 +190,14 @@ public class RiakNodeSshDriver extends AbstractSoftwareProcessSshDriver implemen private ImmutableList<String> installDebianBased() { return ImmutableList.<String>builder() .add("curl https://packagecloud.io/install/repositories/basho/riak/script.deb | " + BashCommands.sudo("bash")) - .add(BashCommands.sudo("apt-get install --assume-yes riak")) + .add(BashCommands.sudo("apt-get install --assume-yes riak=" + getEntity().getFullVersion() + "-1")) .build(); } private ImmutableList<String> installRpmBased() { return ImmutableList.<String>builder() .add("curl https://packagecloud.io/install/repositories/basho/riak/script.rpm | " + BashCommands.sudo("bash")) - .add(BashCommands.sudo("yum install -y riak")) + .add(BashCommands.sudo("yum install -y riak-" + getEntity().getFullVersion() + "-1")) .build(); }
