apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-8324: Config drive changes for xenserver

Browse Source
This commit is contained in:
Jayapal 2015-05-26 14:42:41 +05:30
parent e407986183
commit 69ea932897
5 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/com/cloud/vm/VirtualMachineProfile.java
View File

@ -38,6 +38,8 @@ public interface VirtualMachineProfile {
void setVmData(List<String[]> vmData); void setVmData(List<String[]> vmData);
String getConfigDriveLabel();
void setConfigDriveLabel(String configDriveLabel); void setConfigDriveLabel(String configDriveLabel);
String getConfigDriveIsoRootFolder(); String getConfigDriveIsoRootFolder();

3
engine/components-api/src/com/cloud/vm/VirtualMachineProfileImpl.java
View File

@ -54,7 +54,7 @@ public class VirtualMachineProfileImpl implements VirtualMachineProfile {
List<String[]> vmData = null; List<String[]> vmData = null;
String configDriveLabel = null; String configDriveLabel = null;
String configDriveIsoBaseLocation = "/tmp/"; //TODO: Make this location configurable. String configDriveIsoBaseLocation = "/tmp/";
String configDriveIsoRootFolder = null; String configDriveIsoRootFolder = null;
String configDriveIsoFile = null; String configDriveIsoFile = null;
@ -273,6 +273,7 @@ public class VirtualMachineProfileImpl implements VirtualMachineProfile {
this.vmData = vmData; this.vmData = vmData;
} }
@Override
public String getConfigDriveLabel() { public String getConfigDriveLabel() {
return configDriveLabel; return configDriveLabel;
} }

6
server/src/com/cloud/hypervisor/HypervisorGuruBase.java
View File

@ -173,7 +173,11 @@ public abstract class HypervisorGuruBase extends AdapterBase implements Hypervis
to.setEnableDynamicallyScaleVm(isDynamicallyScalable); to.setEnableDynamicallyScaleVm(isDynamicallyScalable);
to.setUuid(vmInstance.getUuid()); to.setUuid(vmInstance.getUuid());
// to.setVmData(vmProfile.getVmData());
to.setConfigDriveLabel(vmProfile.getConfigDriveLabel());
to.setConfigDriveIsoRootFolder(vmProfile.getConfigDriveIsoRootFolder());
to.setConfigDriveIsoFile(vmProfile.getConfigDriveIsoFile());
return to; return to;
} }

5
server/test/com/cloud/network/MockNetworkModelImpl.java
View File

@ -893,4 +893,9 @@ public class MockNetworkModelImpl extends ManagerBase implements NetworkModel {
return false; //To change body of implemented methods use File | Settings | File Templates. return false; //To change body of implemented methods use File | Settings | File Templates.
} }
@Override
public List<String[]> generateVmData(String userData, String serviceOffering, String zoneName, String vmName, long vmId, String publicKey, String password, Boolean isWindows) {
return null;
}
} }

5
server/test/com/cloud/vpc/MockNetworkModelImpl.java
View File

@ -908,4 +908,9 @@ public class MockNetworkModelImpl extends ManagerBase implements NetworkModel {
return false; //To change body of implemented methods use File | Settings | File Templates. return false; //To change body of implemented methods use File | Settings | File Templates.
} }
@Override
public List<String[]> generateVmData(String userData, String serviceOffering, String zoneName, String vmName, long vmId, String publicKey, String password, Boolean isWindows) {
return null;
}
} }