You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by gr...@apache.org on 2014/12/01 16:52:38 UTC
[1/2] incubator-brooklyn git commit: Set environment when executing
SSH command effectors on MachineEntity
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 3f4ac851e -> e15865319
Set environment when executing SSH command effectors on MachineEntity
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/eeea58d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/eeea58d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/eeea58d3
Branch: refs/heads/master
Commit: eeea58d3f091984231db25fea8d3bdf881946242
Parents: 791d1f1
Author: Andrew Kennedy <gr...@apache.org>
Authored: Wed Nov 26 12:53:04 2014 +0000
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Wed Nov 26 12:53:04 2014 +0000
----------------------------------------------------------------------
.../src/main/java/brooklyn/entity/machine/MachineEntityImpl.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/eeea58d3/software/base/src/main/java/brooklyn/entity/machine/MachineEntityImpl.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/machine/MachineEntityImpl.java b/software/base/src/main/java/brooklyn/entity/machine/MachineEntityImpl.java
index 5f00b2c..67f66d3 100644
--- a/software/base/src/main/java/brooklyn/entity/machine/MachineEntityImpl.java
+++ b/software/base/src/main/java/brooklyn/entity/machine/MachineEntityImpl.java
@@ -24,6 +24,7 @@ import java.util.concurrent.TimeoutException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver;
import brooklyn.entity.basic.EmptySoftwareProcessDriver;
import brooklyn.entity.basic.EmptySoftwareProcessImpl;
import brooklyn.entity.software.SshEffectorTasks;
@@ -158,6 +159,7 @@ public class MachineEntityImpl extends EmptySoftwareProcessImpl implements Machi
public String execCommandTimeout(String command, Duration timeout) {
try {
ProcessTaskWrapper<Integer> task = SshEffectorTasks.ssh(command)
+ .environmentVariables(((AbstractSoftwareProcessSshDriver) getDriver()).getShellEnvironment())
.machine(getMachine())
.summary(command)
.newTask();
[2/2] incubator-brooklyn git commit: This closes #363
Posted by gr...@apache.org.
This closes #363
* github/pr/363:
Set environment when executing SSH command effectors on MachineEntity
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e1586531
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e1586531
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e1586531
Branch: refs/heads/master
Commit: e15865319b4e6b571ba31193c64416af34a7c93b
Parents: 3f4ac85 eeea58d
Author: Andrew Kennedy <gr...@apache.org>
Authored: Mon Dec 1 15:52:34 2014 +0000
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Mon Dec 1 15:52:34 2014 +0000
----------------------------------------------------------------------
.../src/main/java/brooklyn/entity/machine/MachineEntityImpl.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------