in VanillaSoftware, look at shell.env for custom install and customize scripts
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d2ac2738 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d2ac2738 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d2ac2738 Branch: refs/heads/master Commit: d2ac2738bfd732c61c2220c37c4f297f87342ef0 Parents: 63e8c06 Author: Alex Heneveld <[email protected]> Authored: Sat Jun 20 14:30:33 2015 -0700 Committer: Alex Heneveld <[email protected]> Committed: Wed Jun 24 00:40:33 2015 -0700 ---------------------------------------------------------------------- .../brooklyn/entity/basic/VanillaSoftwareProcessSshDriver.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d2ac2738/software/base/src/main/java/brooklyn/entity/basic/VanillaSoftwareProcessSshDriver.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/basic/VanillaSoftwareProcessSshDriver.java b/software/base/src/main/java/brooklyn/entity/basic/VanillaSoftwareProcessSshDriver.java index 004daa1..ac29a87 100644 --- a/software/base/src/main/java/brooklyn/entity/basic/VanillaSoftwareProcessSshDriver.java +++ b/software/base/src/main/java/brooklyn/entity/basic/VanillaSoftwareProcessSshDriver.java @@ -85,6 +85,7 @@ public class VanillaSoftwareProcessSshDriver extends AbstractSoftwareProcessSshD if (Strings.isNonBlank(installCommand)) { newScript(INSTALLING) .failOnNonZeroResultCode() + .environmentVariablesReset(getShellEnvironment()) .body.append(installCommand) .execute(); } @@ -106,8 +107,6 @@ public class VanillaSoftwareProcessSshDriver extends AbstractSoftwareProcessSshD if (Strings.isNonBlank(customizeCommand)) { newScript(CUSTOMIZING) .failOnNonZeroResultCode() - // don't set vars yet -- it resolves dependencies (e.g. DB) which we don't want until we start - .environmentVariablesReset() .body.append(customizeCommand) .execute(); }
