This is an automated email from the ASF dual-hosted git repository. bhaisaab pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push: new ea52a13 CLOUDSTACK-9763: set ssh public key when creating vm data (#1919) ea52a13 is described below commit ea52a1312f2345dc2cdcbff31e326b7202453b42 Author: Joakim Sernbrant <serb...@gmail.com> AuthorDate: Sat Aug 19 20:59:11 2017 +0200 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 d00c9a8..cadaf4f 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); } } } -- To stop receiving notification emails like this one, please contact ['"commits@cloudstack.apache.org" <commits@cloudstack.apache.org>'].