brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [1/2] brooklyn-library git commit: Update RiakNodeSshDriver to use the updated BashCommands.ifExecutableDoesNotExistElse(String, List, List)
Date Thu, 21 Apr 2016 10:32:17 GMT
Repository: brooklyn-library
Updated Branches:
  refs/heads/master aeb3eb728 -> cc5b4be60


Update RiakNodeSshDriver to use the updated BashCommands.ifExecutableDoesNotExistElse(String,
List, List)


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

Branch: refs/heads/master
Commit: a1b11bbe38987dab690553de71181f3583507ff4
Parents: 6541b63
Author: Valentin Aitken <bostko@gmail.com>
Authored: Sun Apr 10 23:51:17 2016 +0300
Committer: Valentin Aitken <bostko@gmail.com>
Committed: Mon Apr 11 00:03:28 2016 +0300

----------------------------------------------------------------------
 .../apache/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a1b11bbe/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java
b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java
index 484e29f..af2e53b 100644
--- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java
+++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java
@@ -25,7 +25,6 @@ import static org.apache.brooklyn.util.ssh.BashCommands.addSbinPathCommand;
 import static org.apache.brooklyn.util.ssh.BashCommands.alternatives;
 import static org.apache.brooklyn.util.ssh.BashCommands.chainGroup;
 import static org.apache.brooklyn.util.ssh.BashCommands.commandToDownloadUrlAs;
-import static org.apache.brooklyn.util.ssh.BashCommands.ifExecutableElse;
 import static org.apache.brooklyn.util.ssh.BashCommands.ifNotExecutable;
 import static org.apache.brooklyn.util.ssh.BashCommands.ok;
 import static org.apache.brooklyn.util.ssh.BashCommands.sbinPath;
@@ -40,7 +39,6 @@ import java.util.Map;
 import org.apache.brooklyn.api.location.OsDetails;
 import org.apache.brooklyn.core.effector.ssh.SshEffectorTasks;
 import org.apache.brooklyn.core.entity.Attributes;
-import org.apache.brooklyn.core.entity.Entities;
 import org.apache.brooklyn.entity.java.JavaSoftwareProcessSshDriver;
 import org.apache.brooklyn.entity.software.base.lifecycle.ScriptHelper;
 import org.apache.brooklyn.location.ssh.SshMachineLocation;
@@ -48,7 +46,6 @@ import org.apache.brooklyn.util.collections.MutableMap;
 import org.apache.brooklyn.util.core.task.DynamicTasks;
 import org.apache.brooklyn.util.core.task.ssh.SshTasks;
 import org.apache.brooklyn.util.net.Urls;
-import org.apache.brooklyn.util.os.Os;
 import org.apache.brooklyn.util.ssh.BashCommands;
 import org.apache.brooklyn.util.text.Strings;
 import org.slf4j.Logger;
@@ -192,7 +189,7 @@ public class RiakNodeSshDriver extends JavaSoftwareProcessSshDriver implements
R
         return ImmutableList.<String>builder()
                 .add(osDetails.getName().toLowerCase().contains("debian") ? addSbinPathCommand()
: "")
                 .add(ifNotExecutable("curl", INSTALL_CURL))
-                .addAll(ifExecutableElse("yum", installDebianBased(), installRpmBased()))
+                .addAll(BashCommands.ifExecutableDoesNotExistElse("yum", installDebianBased(),
installRpmBased()))
                 .build();
     }
 


Mime
View raw message