From ea52a1312f2345dc2cdcbff31e326b7202453b42 Mon Sep 17 00:00:00 2001
From: Joakim Sernbrant <serbaut@gmail.com>
Date: Sat, 19 Aug 2017 20:59:11 +0200
Subject: [PATCH] CLOUDSTACK-9763: set ssh public key when creating vm data
 (#1919)

---
 server/src/com/cloud/network/router/CommandSetupHelper.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/network/router/CommandSetupHelper.java b/server/src/com/cloud/network/router/CommandSetupHelper.java
index d00c9a8861b..cadaf4fcdf8 100644
--- a/server/src/com/cloud/network/router/CommandSetupHelper.java
+++ b/server/src/com/cloud/network/router/CommandSetupHelper.java
@@ -601,7 +601,9 @@ public class CommandSetupHelper {
                 final NicVO nic = _nicDao.findByNtwkIdAndInstanceId(guestNetworkId, vm.getId());
                 if (nic != null) {
                     s_logger.debug("Creating user data entry for vm " + vm + " on domR " + router);
-                    createVmDataCommand(router, vm, nic, null, cmds);
+
+                    _userVmDao.loadDetails(vm);
+                    createVmDataCommand(router, vm, nic, vm.getDetail("SSH.PublicKey"), cmds);
                 }
             }
         }