From 8af9463913107ade8890edd0c743ba7d007f3ed4 Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Thu, 12 Nov 2020 10:35:49 -0500 Subject: [PATCH] fix issues when launching from mac --- .../java/bubble/service/cloud/StandardNetworkService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java b/bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java index d58ccdea..dfffe428 100644 --- a/bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java +++ b/bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java @@ -548,7 +548,7 @@ public class StandardNetworkService implements NetworkService { .addArgument("-c") .addArgument(script, false)) .setOut(progressMeter) - .setCopyToStandard(configuration.testMode())); + .setCopyToStandard(log.isTraceEnabled())); } protected String getAnsibleSetupScript(TempDir automation, String sshArgs, String nodeUser, String sshTarget) { @@ -558,9 +558,12 @@ public class StandardNetworkService implements NetworkService { "echo '" + METER_TICK_COPYING_ANSIBLE + "' && " + "rsync -az -e \"ssh " + sshArgs + "\" . "+sshTarget+ ":" + ANSIBLE_DIR + " && " + + // ensure ansible dir is owned by root + "ssh "+sshArgs+" "+sshTarget+" chown -R root " + ANSIBLE_DIR + " && " + + // run install_local.sh on remote host, installs ansible locally "echo '" + METER_TICK_RUNNING_ANSIBLE + "' && " + - "ssh "+sshArgs+" "+sshTarget+" ~"+nodeUser+ "/" + ANSIBLE_DIR + "/" + INSTALL_LOCAL_SH; + "ssh "+sshArgs+" "+sshTarget+" ./" + ANSIBLE_DIR + "/" + INSTALL_LOCAL_SH; } private File writeFile(File dir, Map ctx, String filename, String templateOrData) throws IOException {