etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-9763: set ssh public key when creating vm data (#1919)

This commit is contained in:
Joakim Sernbrant 2017-08-19 20:59:11 +02:00 committed by Rohit Yadav
parent 4e4d7c7e36
commit ea52a1312f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/network/router/CommandSetupHelper.java
View File

@ -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);
}
}
}