diff --git a/server/src/com/cloud/deploy/BareMetalPlanner.java b/server/src/com/cloud/deploy/BareMetalPlanner.java
index e1319997967..f4344733317 100644
--- a/server/src/com/cloud/deploy/BareMetalPlanner.java
+++ b/server/src/com/cloud/deploy/BareMetalPlanner.java
@@ -1,30 +1,48 @@
 package com.cloud.deploy;
 
 import java.util.List;
+import java.util.Map;
 
 import javax.ejb.Local;
+import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
 
+import com.cloud.capacity.CapacityManager;
+import com.cloud.dc.ClusterVO;
+import com.cloud.dc.DataCenter;
+import com.cloud.dc.Pod;
+import com.cloud.dc.dao.ClusterDao;
+import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.dc.dao.HostPodDao;
 import com.cloud.exception.InsufficientServerCapacityException;
 import com.cloud.host.Host;
 import com.cloud.host.HostVO;
+import com.cloud.host.Status;
+import com.cloud.host.dao.HostDao;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.offering.ServiceOffering;
-import com.cloud.service.ServiceOfferingVO;
+import com.cloud.org.Cluster;
+import com.cloud.utils.component.Inject;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachineProfile;
 import com.cloud.vm.VirtualMachineProfileImpl;
 
 @Local(value=DeploymentPlanner.class)
-public class BareMetalPlanner extends FirstFitPlanner implements DeploymentPlanner {
+public class BareMetalPlanner implements DeploymentPlanner {
 	private static final Logger s_logger = Logger.getLogger(BareMetalPlanner.class);
+	@Inject protected DataCenterDao _dcDao;
+	@Inject protected HostPodDao _podDao;
+	@Inject protected ClusterDao _clusterDao;
+	@Inject protected HostDao _hostDao;
+	@Inject protected CapacityManager _capacityMgr;
+	String _name;
 	
 	@Override
 	public DeployDestination plan(VirtualMachineProfile vmProfile, DeploymentPlan plan, ExcludeList avoid) throws InsufficientServerCapacityException {
 		VirtualMachine vm = vmProfile.getVirtualMachine();
-		ServiceOffering offering = vmProfile.getServiceOffering();
+		ServiceOffering offering = vmProfile.getServiceOffering();	
 		String hostTag = null;
 		
 		if (offering.getTags() != null) {
@@ -34,9 +52,17 @@ public class BareMetalPlanner extends FirstFitPlanner implements DeploymentPlann
 			}
 		}
 		
+		List<ClusterVO> clusters = _clusterDao.listByHyTypeWithoutGuid(HypervisorType.BareMetal.name());
+		if (clusters.size() != 1) {
+			throw new CloudRuntimeException("Invaild baremetal cluster number " + clusters.size());
+		}
+		Cluster cluster = clusters.get(0);
+		
+		int cpu_requested;
+		long ram_requested;
+		HostVO target = null;
+		List<HostVO> hosts = _hostDao.listByCluster(cluster.getId());
 		if (hostTag != null) {
-			List<HostVO> hosts = _hostDao.listBy(Host.Type.Routing, vm.getDataCenterId());
-			HostVO target = null;
 			for (HostVO h : hosts) {
 				_hostDao.loadDetails(h);
 				if (h.getDetail("hostTag") != null && h.getDetail("hostTag").equalsIgnoreCase(hostTag)) {
@@ -44,37 +70,61 @@ public class BareMetalPlanner extends FirstFitPlanner implements DeploymentPlann
 					break;
 				}
 			}
-			
-			if (target == null) {
-				s_logger.warn("Cannot find host with tag " + hostTag);
-				return null;
-			}
-			
-			int cpu = target.getCpus();
-			int speed = target.getSpeed().intValue();
-			Long ramSize = target.getTotalMemory() / (1024L*1024L);
-			ServiceOfferingVO newOffering = new ServiceOfferingVO(offering.getName(), cpu, ramSize.intValue(), speed, offering.getRateMbps(),
-					offering.getMulticastRateMbps(), false, offering.getDisplayText(), offering.getUseLocalStorage(), false, offering.getTags(), false);
-			((VirtualMachineProfileImpl)vmProfile).setServiceOffering(newOffering);
+		}
+
+		if (target == null) {
+			s_logger.warn("Cannot find host with tag " + hostTag + " use capacity from service offering");
+			cpu_requested = offering.getCpu() * offering.getSpeed();
+			ram_requested = offering.getRamSize() * 1024 * 1024;
+		} else {
+			cpu_requested = target.getCpus() * target.getSpeed().intValue();
+			ram_requested = target.getTotalMemory();
 		}
 		
-		DeployDestination dest = super.plan(vmProfile, plan, avoid);
-		
-		if (hostTag == null && dest != null) {
-			Host h = dest.getHost();
-			if (h.getCpus() != offering.getCpu() || h.getTotalMemory() != offering.getRamSize() || h.getSpeed() != offering.getSpeed()) {
-				throw new CloudRuntimeException(String.format("Bare Metal only allows one VM one host, " +
-						"the offering capcacity doesn't equal to host capacity(offering: cpu number:%$1s, cpu speed:%$2s," +
-						"ram size:%3$s; host: cpu number:%$4s, cpu speed:%$5s, ram size:%$6s)", offering.getCpu(), offering.getSpeed(),
-						offering.getRamSize(), h.getCpus(), h.getSpeed(), h.getTotalMemory()));
+		for (HostVO h : hosts) {
+			if (h.getStatus() == Status.Up) {
+				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());
+					return new DeployDestination(dc, pod, cluster, h);
+				}
 			}
 		}
 		
-		return dest;
+		s_logger.warn(String.format("Cannot find enough capacity(requested cpu=%1$s memory=%2$s)", cpu_requested, ram_requested));
+		return null;
 	}
 
 	@Override
 	public boolean canHandle(VirtualMachineProfile<? extends VirtualMachine> vm, DeploymentPlan plan, ExcludeList avoid) {
 		return vm.getHypervisorType() == HypervisorType.BareMetal;
 	}
+
+	@Override
+	public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
+		_name = name;
+		return true;
+	}
+
+	@Override
+	public String getName() {
+		return _name;
+	}
+
+	@Override
+	public boolean start() {
+		return true;
+	}
+
+	@Override
+	public boolean stop() {
+		return true;
+	}
+
+	@Override
+	public boolean check(VirtualMachineProfile<? extends VirtualMachine> vm, DeploymentPlan plan, DeployDestination dest, ExcludeList exclude) {
+		// TODO Auto-generated method stub
+		return false;
+	}
 }