Skip to content
Permalink
Browse files
This closes #1132
  • Loading branch information
ahgittin committed Jan 19, 2016
2 parents 1c7ab43 + 8d1ff75 commit ae01e5e164adfd5b431e565510cf500f7e6102a6
Showing 1 changed file with 12 additions and 13 deletions.
@@ -107,23 +107,22 @@ public void start() {
skipStart = entityStarted.or(false);
}
if (!skipStart) {
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("pre-install-command", new Runnable() { public void run() {
runPreInstallCommand();
}});

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("pre-install-command", new Runnable() { public void run() {
runPreInstallCommand();
}});
DynamicTasks.queue("setup", new Runnable() { public void run() {
waitForConfigKey(BrooklynConfigKeys.SETUP_LATCH);
setup();

0 comments on commit ae01e5e

Please sign in to comment.