You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 18:50:07 UTC
[10/50] [abbrv] brooklyn-server git commit: in VanillaSoftware,
look at shell.env for custom install and customize scripts
in VanillaSoftware, look at shell.env for custom install and customize scripts
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/e5798412
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/e5798412
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/e5798412
Branch: refs/heads/0.7.0-incubating
Commit: e57984123f52b774700e53083aa86a05ce67c2bf
Parents: 5690992
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Sat Jun 20 14:30:33 2015 -0700
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
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/brooklyn-server/blob/e5798412/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();
}