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

bug 14188: always make sure to inject SSH keys before copying systemvm ISO to secondary storage

This commit is contained in:
Kelven Yang 2012-03-21 14:20:43 -07:00
parent f29bb12486
commit 4233cd7aba
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/com/cloud/hypervisor/vmware/VmwareManagerImpl.java
View File

@ -62,6 +62,7 @@ import com.cloud.network.router.VirtualNetworkApplianceManager;
import com.cloud.org.Cluster.ClusterType;
import com.cloud.secstorage.CommandExecLogDao;
import com.cloud.serializer.GsonHelper;
import com.cloud.server.ConfigurationServer;
import com.cloud.storage.StorageLayer;
import com.cloud.storage.secondary.SecondaryStorageVmManager;
import com.cloud.utils.FileUtil;
@ -105,6 +106,8 @@ public class VmwareManagerImpl implements VmwareManager, VmwareStorageMount, Lis
@Inject CheckPointManager _checkPointMgr;
@Inject VirtualNetworkApplianceManager _routerMgr;
@Inject SecondaryStorageVmManager _ssvmMgr;
ConfigurationServer _configServer;
String _mountParent;
StorageLayer _storage;
@ -272,6 +275,9 @@ public class VmwareManagerImpl implements VmwareManager, VmwareStorageMount, Lis
((VmwareStorageManagerImpl)_storageMgr).configure(params);
if(_configServer == null)
_configServer = (ConfigurationServer)ComponentLocator.getComponent(ConfigurationServer.Name);
_agentMgr.registerForHostEvents(this, true, true, true);
s_logger.info("VmwareManagerImpl has been successfully configured");
@ -527,6 +533,9 @@ public class VmwareManagerImpl implements VmwareManager, VmwareStorageMount, Lis
File srcIso = getSystemVMPatchIsoFile();
File destIso = new File(mountPoint + "/systemvm/" + getSystemVMIsoFileNameOnDatastore());
if(!destIso.exists()) {
s_logger.info("Inject SSH key pairs before copying systemvm.iso into secondary storage");
_configServer.updateKeyPairs();
try {
FileUtil.copyfile(srcIso, destIso);
} catch(IOException e) {

2
server/src/com/cloud/server/ConfigurationServer.java
View File

@ -33,5 +33,5 @@ public interface ConfigurationServer {
* @return
*/
public void persistDefaultValues() throws InternalErrorException;
public void updateKeyPairs();
}

3
server/src/com/cloud/server/ConfigurationServerImpl.java
View File

@ -574,8 +574,9 @@ public class ConfigurationServerImpl implements ConfigurationServer {
}
@Override
@DB
protected void updateKeyPairs() {
public void updateKeyPairs() {
// Grab the SSH key pair and insert it into the database, if it is not present
String userid = System.getProperty("user.name");