[cloudstack] branch 4.17 updated: VR: fix public-key is missing in VR after acquiring public IP (#7103)

[da...@apache.org]

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

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


The following commit(s) were added to refs/heads/4.17 by this push:
     new e8c1b5509ea VR: fix public-key is missing in VR after acquiring public IP (#7103)
e8c1b5509ea is described below

commit e8c1b5509ea2367c95eff62581f3e05978ac52c1
Author: Wei Zhou <we...@apache.org>
AuthorDate: Wed Jan 25 10:38:28 2023 +0100

    VR: fix public-key is missing in VR after acquiring public IP (#7103)
---
 .../org/apache/cloudstack/network/topology/BasicNetworkVisitor.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/main/java/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java b/server/src/main/java/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
index c25c80f5fc2..f366189b265 100644
--- a/server/src/main/java/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
+++ b/server/src/main/java/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java
@@ -254,7 +254,7 @@ public class BasicNetworkVisitor extends NetworkTopologyVisitor {
         final NicVO nicVo = userdata.getNicVo();
 
         final Commands commands = new Commands(Command.OnError.Stop);
-        _commandSetupHelper.createVmDataCommand(router, userVM, nicVo, null, commands);
+        _commandSetupHelper.createVmDataCommand(router, userVM, nicVo, userVM.getDetail("SSH.PublicKey"), commands);
 
         return _networkGeneralHelper.sendCommandsToRouter(router, commands);
     }