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

CLOUDSTACK-6869: SSH Public key content is overridden by template's meta data when you create a instance 

(cherry picked from commit 522208dec2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/template/TemplateManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
This commit is contained in:
Harikrishna Patnala 2014-06-11 16:33:00 +05:30 committed by Rohit Yadav
parent bad40a7481
commit 8992e18836
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/src/com/cloud/template/TemplateManagerImpl.java
View File

@ -1700,7 +1700,8 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
}
}
}
if(cmd.getDetails() != null) {
if (cmd.getDetails() != null) {
details.remove("Encrypted.Password"); // new password will be generated during vm deployment from password enabled template
details.putAll(cmd.getDetails());
}
if( !details.isEmpty()) {

11
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -2989,6 +2989,12 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
hostName, diskOfferingId);
vm.setUuid(uuidName);
vm.setDynamicallyScalable(template.isDynamicallyScalable());
Map<String, String> details = template.getDetails();
if (details != null && !details.isEmpty()) {
vm.details.putAll(details);
}
if (sshPublicKey != null) {
vm.setDetail("SSH.PublicKey", sshPublicKey);
}
@ -3038,11 +3044,6 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
}
}
Map<String, String> details = template.getDetails();
if ( details != null && !details.isEmpty() ) {
vm.details.putAll(details);
}
_vmDao.persist(vm);
if (customParameters != null && customParameters.size() > 0) {
for (String key : customParameters.keySet()) {