Repository: incubator-brooklyn Updated Branches: refs/heads/master 76d24ca04 -> 42d9871ec
Adding --replacepkgs parameter to ensure proper epel install - rpm -Uvh exits with 1 if it is already installed - replacepkgs ensures that the package will be properly updated or replaced if already 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/c38f8ad4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c38f8ad4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c38f8ad4 Branch: refs/heads/master Commit: c38f8ad4e51ce8792343a67432eca48bcb290192 Parents: 5ef0b61 Author: Yavor Yanchev <[email protected]> Authored: Mon Aug 17 18:42:46 2015 +0300 Committer: Yavor Yanchev <[email protected]> Committed: Mon Aug 17 18:42:46 2015 +0300 ---------------------------------------------------------------------- .../java/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c38f8ad4/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java ---------------------------------------------------------------------- diff --git a/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java b/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java index 470221e..9c9ff4a 100644 --- a/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java +++ b/software/messaging/src/main/java/brooklyn/entity/messaging/rabbit/RabbitSshDriver.java @@ -100,7 +100,7 @@ public class RabbitSshDriver extends AbstractSoftwareProcessSshDriver implements List<String> commands = ImmutableList.<String>builder() // EPEL repository for erlang install required on some Centos distributions - .add(chainGroup("which yum", sudo("yum -y update ca-certificates"), sudo("rpm -Uvh " + + .add(chainGroup("which yum", sudo("yum -y update ca-certificates"), sudo("rpm -Uvh --replacepkgs " + format("http://download.fedoraproject.org/pub/epel/%s/%s/epel-release-%s.noarch.rpm";, osMajorVersion, osArchitecture, epelVersion)))) .add(ifExecutableElse0("zypper", chainGroup( ok(sudo("zypper --non-interactive addrepo http://download.opensuse.org/repositories/devel:/languages:/erlang/SLE_11_SP3 erlang_sles_11")),
