From 3cac7f01bb7799e117460a67dc8506397536162d Mon Sep 17 00:00:00 2001
From: David Nalley <david@gnsa.us>
Date: Sun, 12 Oct 2014 23:19:30 -0400
Subject: [PATCH] Revert "CLOUDSTACK-6278"

This reverts commit bc2ec23d09e28b30a9cc3cb4a7d6f52c8e718fcf.
---
 .../cloud/deploy/DeploymentPlanningManagerImpl.java   | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
index 146352e977d..9eaef1ea890 100755
--- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -403,15 +403,6 @@ StateListener<State, VirtualMachine.Event, VirtualMachine> {
                             s_logger.debug("The last host of this VM is UP and has enough capacity");
                             s_logger.debug("Now checking for suitable pools under zone: " + host.getDataCenterId()
                                     + ", pod: " + host.getPodId() + ", cluster: " + host.getClusterId());
-
-                            Pod pod = _podDao.findById(host.getPodId());
-                            Cluster cluster = _clusterDao.findById(host.getClusterId());
-                            if (vm.getHypervisorType() == HypervisorType.BareMetal) {
-                                DeployDestination dest = new DeployDestination(dc, pod, cluster, host, new HashMap<Volume, StoragePool>());
-                                s_logger.debug("Returning Deployment Destination: " + dest);
-                                return dest;
-                            }
-
                             // search for storage under the zone, pod, cluster
                             // of
                             // the last host.
@@ -431,6 +422,8 @@ StateListener<State, VirtualMachine.Event, VirtualMachine> {
                                         suitableHosts, suitableVolumeStoragePools, avoids,
                                         getPlannerUsage(planner, vmProfile, plan, avoids), readyAndReusedVolumes);
                                 if (potentialResources != null) {
+                                    Pod pod = _podDao.findById(host.getPodId());
+                                    Cluster cluster = _clusterDao.findById(host.getClusterId());
                                     Map<Volume, StoragePool> storageVolMap = potentialResources.second();
                                     // remove the reused vol<->pool from
                                     // destination, since we don't have to