Repository: brooklyn-server Updated Branches: refs/heads/master 4d72b68d8 -> 6e39ce68b
Move preInstall tasks outside skip check for Clocker Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/48e8fd7b Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/48e8fd7b Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/48e8fd7b Branch: refs/heads/master Commit: 48e8fd7b0941efd3f34dabb9023b0c22ffbb22c4 Parents: a5660ea Author: Andrew Donald Kennedy <andrew.kenn...@cloudsoftcorp.com> Authored: Mon Feb 29 21:32:57 2016 +0000 Committer: Andrew Donald Kennedy <andrew.kenn...@cloudsoftcorp.com> Committed: Fri Mar 4 17:57:47 2016 +0000 ---------------------------------------------------------------------- .../base/AbstractSoftwareProcessDriver.java | 27 ++++++++++---------- 1 file changed, 14 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/48e8fd7b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessDriver.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessDriver.java b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessDriver.java index 79a150c..b48fab8 100644 --- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessDriver.java +++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/AbstractSoftwareProcessDriver.java @@ -108,23 +108,24 @@ public abstract class AbstractSoftwareProcessDriver implements SoftwareProcessDr } if (!skipStart) { DynamicTasks.queue("install", new Runnable() { public void run() { - Optional<Boolean> locationInstalled = Optional.fromNullable(getLocation().getConfig(BrooklynConfigKeys.SKIP_ENTITY_INSTALLATION)); Optional<Boolean> entityInstalled = Optional.fromNullable(entity.getConfig(BrooklynConfigKeys.SKIP_ENTITY_INSTALLATION)); - boolean skipInstall = locationInstalled.or(entityInstalled).or(false); - if (!skipInstall) { - DynamicTasks.queue("copy-pre-install-resources", new Runnable() { public void run() { - waitForConfigKey(BrooklynConfigKeys.PRE_INSTALL_RESOURCES_LATCH); - copyPreInstallResources(); - }}); - DynamicTasks.queue("pre-install", new Runnable() { public void run() { - preInstall(); - }}); + DynamicTasks.queue("copy-pre-install-resources", new Runnable() { public void run() { + waitForConfigKey(BrooklynConfigKeys.PRE_INSTALL_RESOURCES_LATCH); + copyPreInstallResources(); + }}); - DynamicTasks.queue("pre-install-command", new Runnable() { public void run() { - runPreInstallCommand(); - }}); + DynamicTasks.queue("pre-install", new Runnable() { public void run() { + preInstall(); + }}); + + DynamicTasks.queue("pre-install-command", new Runnable() { public void run() { + runPreInstallCommand(); + }}); + + boolean skipInstall = locationInstalled.or(entityInstalled).or(false); + if (!skipInstall) { DynamicTasks.queue("setup", new Runnable() { public void run() { waitForConfigKey(BrooklynConfigKeys.SETUP_LATCH); setup();
