You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2015/12/11 13:39:52 UTC
[02/15] incubator-brooklyn git commit: Redis install - make sure all
build dependencies are installed
Redis install - make sure all build dependencies are installed
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3f34c4ad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3f34c4ad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3f34c4ad
Branch: refs/heads/master
Commit: 3f34c4adfa2d307498531262019653e8b852a049
Parents: 27d7b78
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Tue Dec 8 11:28:20 2015 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Tue Dec 8 11:28:20 2015 +0200
----------------------------------------------------------------------
.../brooklyn/entity/nosql/redis/RedisStoreSshDriver.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3f34c4ad/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java
index 4aa2b8e..81ebfe3 100644
--- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java
+++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java
@@ -21,9 +21,8 @@ package org.apache.brooklyn.entity.nosql.redis;
import static java.lang.String.format;
import java.util.List;
+import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.core.entity.Entities;
import org.apache.brooklyn.entity.software.base.AbstractSoftwareProcessSshDriver;
@@ -31,8 +30,11 @@ import org.apache.brooklyn.location.ssh.SshMachineLocation;
import org.apache.brooklyn.util.collections.MutableMap;
import org.apache.brooklyn.util.os.Os;
import org.apache.brooklyn.util.ssh.BashCommands;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
/**
* Start a {@link RedisStore} in a {@link Location} accessible over ssh.
@@ -66,6 +68,9 @@ public class RedisStoreSshDriver extends AbstractSoftwareProcessSshDriver implem
"yum", "make",
"apt", "make",
"port", null);
+ //Headers still might be missing on some systems (especially if gcc & make are pre-installed)
+ Map<String, String> installBuildEssentialPackageFlags = ImmutableMap.of(
+ "apt", "build-essential");
List<String> commands = ImmutableList.<String>builder()
.addAll(BashCommands.commandsToDownloadUrlsAs(urls, saveAs))
@@ -73,6 +78,7 @@ public class RedisStoreSshDriver extends AbstractSoftwareProcessSshDriver implem
.add(BashCommands.INSTALL_CURL)
.add(BashCommands.installPackage(installGccPackageFlags, "redis-prerequisites-gcc"))
.add(BashCommands.installPackage(installMakePackageFlags, "redis-prerequisites-make"))
+ .add(BashCommands.installPackage(installBuildEssentialPackageFlags, null))
.add("tar xzfv " + saveAs)
.add(format("cd redis-%s", getVersion()))
.add("pushd deps")