brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From grk...@apache.org
Subject [1/2] incubator-brooklyn git commit: Set environment when executing SSH command effectors on MachineEntity
Date Mon, 01 Dec 2014 15:52:38 GMT
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 <grkvlt@apache.org>
Authored: Wed Nov 26 12:53:04 2014 +0000
Committer: Andrew Kennedy <grkvlt@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();


Mime
View raw message