Browse Source

fix issues when launching from mac

tags/v1.4.0
Jonathan Cobb 3 years ago
parent
commit
8af9463913
1 changed files with 5 additions and 2 deletions
  1. +5
    -2
      bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java

+ 5
- 2
bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java View File

@@ -548,7 +548,7 @@ public class StandardNetworkService implements NetworkService {
.addArgument("-c") .addArgument("-c")
.addArgument(script, false)) .addArgument(script, false))
.setOut(progressMeter) .setOut(progressMeter)
.setCopyToStandard(configuration.testMode()));
.setCopyToStandard(log.isTraceEnabled()));
} }


protected String getAnsibleSetupScript(TempDir automation, String sshArgs, String nodeUser, String sshTarget) { 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 + "' && " + "echo '" + METER_TICK_COPYING_ANSIBLE + "' && " +
"rsync -az -e \"ssh " + sshArgs + "\" . "+sshTarget+ ":" + ANSIBLE_DIR + " && " + "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 // run install_local.sh on remote host, installs ansible locally
"echo '" + METER_TICK_RUNNING_ANSIBLE + "' && " + "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<String, Object> ctx, String filename, String templateOrData) throws IOException { private File writeFile(File dir, Map<String, Object> ctx, String filename, String templateOrData) throws IOException {


Loading…
Cancel
Save