[cloudstack] branch 4.15 updated: Fix failure to scp diagnostic data file from SSVM on ubuntu based env (#5384)

[rohit]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.15
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.15 by this push:
     new 4acedc8  Fix failure to scp diagnostic data file from SSVM on ubuntu 
based env (#5384)
4acedc8 is described below

commit 4acedc8308a13763d118a8bf7502bd159580670a
Author: Pearl Dsilva <pearl1...@gmail.com>
AuthorDate: Sat Aug 28 10:30:31 2021 +0530

    Fix failure to scp diagnostic data file from SSVM on ubuntu based env 
(#5384)
---
 .../org/apache/cloudstack/diagnostics/DiagnosticsServiceImpl.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/server/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsServiceImpl.java
 
b/server/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsServiceImpl.java
index 0184a44..f5bba77 100644
--- 
a/server/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsServiceImpl.java
+++ 
b/server/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsServiceImpl.java
@@ -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);
             }