From cdaa1edfa51e3eb636c56c54c321905a97ab44a3 Mon Sep 17 00:00:00 2001
From: Frank <frank@cloud.com>
Date: Thu, 24 Mar 2011 16:50:23 -0700
Subject: [PATCH] Bug 8208 - bare metal provisioning

Set dhcp range of linmin DHCPD to empty, so it will not conflict with
our External DHCP
---
 scripts/util/prepare_linmin.sh                    | 15 +++++++++++++++
 server/src/com/cloud/deploy/BareMetalPlanner.java |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 scripts/util/prepare_linmin.sh

diff --git a/scripts/util/prepare_linmin.sh b/scripts/util/prepare_linmin.sh
new file mode 100644
index 00000000000..6534aa8d2f1
--- /dev/null
+++ b/scripts/util/prepare_linmin.sh
@@ -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
diff --git a/server/src/com/cloud/deploy/BareMetalPlanner.java b/server/src/com/cloud/deploy/BareMetalPlanner.java
index 809c0b26ea2..4503aaae425 100644
--- a/server/src/com/cloud/deploy/BareMetalPlanner.java
+++ b/server/src/com/cloud/deploy/BareMetalPlanner.java
@@ -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());