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

Bug 8208 - bare metal provisioning

Browse Source 
Set dhcp range of linmin DHCPD to empty, so it will not conflict with
our External DHCP
This commit is contained in:
Frank 2011-03-24 16:50:23 -07:00
parent 8aa0ab99da
commit cdaa1edfa5
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/util/prepare_linmin.sh Normal file
View File

@ -0,0 +1,15 @@
#!/bin/sh
DHCP_CONF="/etc/dhcpd.conf"
err_exit() {
echo "$*"
exit 1
}
[ ! -f $DHCP_CONF ] && err_exit "Cannot find $DHCP_CONF"
cat $DHCP_CONF | tr '\n' '~' > /tmp/dhcpd.tmp && sed -i 's/\(subnet.*netmask.*{\).*\(~}\)/\1\2/g' /tmp/dhcpd.tmp && cat /tmp/dhcpd.tmp | tr '~' '\n' > $DHCP_CONF && rm /tmp/dhcpd.tmp -f
[ $? -ne 0 ] && err_exit "Configure dhcpd.conf failed"
service dhcpd restart
[ $? -ne 0 ] && err_exit "restart dhcpd failed"
exit 0

2
server/src/com/cloud/deploy/BareMetalPlanner.java
View File

@ -92,7 +92,7 @@ public class BareMetalPlanner implements DeploymentPlanner {
for (HostVO h : hosts) {
if (h.getStatus() == Status.Up) {
if(_capacityMgr.checkIfHostHasCapacity(h.getId(), cpu_requested, ram_requested, true)){
if(_capacityMgr.checkIfHostHasCapacity(h.getId(), cpu_requested, ram_requested, false)){
s_logger.debug("Find host " + h.getId() + " has enough capacity");
DataCenter dc = _dcDao.findById(h.getDataCenterId());
Pod pod = _podDao.findById(h.getPodId());