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

Set type and dhcp range in finalizeVirtualMachineProfile

This commit is contained in:
alena 2010-12-07 15:42:30 -08:00
parent bf987c57d9
commit c8bd857db6
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
server/src/com/cloud/network/router/DomainRouterManagerImpl.java
View File

@ -2168,8 +2168,21 @@ public class DomainRouterManagerImpl implements DomainRouterManager, DomainRoute
@Override
public boolean finalizeVirtualMachineProfile(VirtualMachineProfile<DomainRouterVO> profile, DeployDestination dest, ReservationContext context) {
StringBuilder buf = profile.getBootArgsBuilder();
buf.append(" template=domP type=router");
DomainRouterVO router = profile.getVirtualMachine();
NetworkVO network = _networkDao.findById(router.getNetworkId());
String type = null;
String dhcpRange = network.getCidr();
String domain = network.getNetworkDomain();
if (router.getRole() == Role.DHCP_USERDATA) {
type="dhcpsrvr";
} else {
type = "router";
}
StringBuilder buf = profile.getBootArgsBuilder();
buf.append(" template=domP type=" + type);
buf.append(" name=").append(profile.getHostName());
NicProfile controlNic = null;
for (NicProfile nic : profile.getNics()) {
@ -2188,6 +2201,14 @@ public class DomainRouterManagerImpl implements DomainRouterManager, DomainRoute
} else if (nic.getTrafficType() == TrafficType.Control) {
controlNic = nic;
}
if (dhcpRange != null) {
buf.append(" dhcprange=" + dhcpRange);
}
if (domain != null) {
buf.append(" domain="+router.getDomain());
}
}
if (s_logger.isDebugEnabled()) {
@ -2658,6 +2679,4 @@ public class DomainRouterManagerImpl implements DomainRouterManager, DomainRoute
}
return true;
}
}