etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix failure to scp diagnostic data file from SSVM on ubuntu based env (#5384)

This commit is contained in:
Pearl Dsilva 2021-08-28 10:30:31 +05:30 committed by GitHub
parent e968f3b16a
commit 4acedc8308
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsServiceImpl.java
View File

@ -340,8 +340,8 @@ public class DiagnosticsServiceImpl extends ManagerBase implements PluggableServ
File dataDirectory = new File(dataDirectoryInSecondaryStore);
boolean existsInSecondaryStore = dataDirectory.exists() || dataDirectory.mkdir();
if (existsInSecondaryStore) {
// scp from system VM to mounted sec storage directory
File permKey = new File("/var/cloudstack/management/.ssh/id_rsa");
String homeDir = System.getProperty("user.home");
File permKey = new File(homeDir + "/.ssh/id_rsa");
SshHelper.scpFrom(vmSshIp, 3922, "root", permKey, dataDirectoryInSecondaryStore, diagnosticsFile);
}