commit 6f3694c4311fa3cdf4cb81c49b5f75378600d672
author Kai Takahashi <39983652+cl-k-takahashi@users.noreply.github.com> Fri Dec 06 21:56:38 2019 +0900
committer Rohit Yadav <rohit.yadav@shapeblue.com> Fri Dec 06 18:26:38 2019 +0530
tree f1a56820d28f80294e59b8206ce8ce98cb4ab451
parent e56fa313793855800a5174fdb5cf79a96d1ba519

server: save SSH.PublicKey into user_vm_details regardless of password management (#3745)

Fixes: #3744

Signed-off-by: Kai Takahashi <k-takahashi@creationline.com>

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index bb4246e..11c1eff 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -863,9 +863,8 @@
                 userVm.setPassword(password);
                 //update the encrypted password in vm_details table too
                 encryptAndStorePassword(userVm, password);
-            } else {
-                _vmDao.saveDetails(userVm);
             }
+            _vmDao.saveDetails(userVm);
 
             if (vmInstance.getState() == State.Stopped) {
                 s_logger.debug("Vm " + vmInstance + " is stopped, not rebooting it as a part of SSH Key reset");