cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prachida...@apache.org
Subject git commit: updated refs/heads/planner_reserve to 7a92772
Date Thu, 16 May 2013 21:25:24 GMT
Updated Branches:
  refs/heads/planner_reserve 0d23cd3c9 -> 7a9277299


Corrected the check for baremetal


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7a927729
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7a927729
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7a927729

Branch: refs/heads/planner_reserve
Commit: 7a9277299ae3e97b17324a19803c16304b3bb43c
Parents: 0d23cd3
Author: Prachi Damle <prachi@cloud.com>
Authored: Thu May 16 14:24:44 2013 -0700
Committer: Prachi Damle <prachi@cloud.com>
Committed: Thu May 16 14:24:44 2013 -0700

----------------------------------------------------------------------
 .../deploy/DeploymentPlanningManagerImpl.java      |    2 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7a927729/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
index 62a175a..c86d5e1 100644
--- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -223,7 +223,7 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements
Deploy
         ServiceOffering offering = vmProfile.getServiceOffering();
         String plannerName = offering.getDeploymentPlanner();
         if (plannerName == null) {
-            if (vm.getHypervisorType() != HypervisorType.BareMetal) {
+            if (vm.getHypervisorType() == HypervisorType.BareMetal) {
                 plannerName = "BareMetalPlanner";
             } else {
                 plannerName = _configDao.getValue(Config.VmDeploymentPlanner.key());

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7a927729/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index ed1ce5f..e0b042e 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -3171,7 +3171,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager,
Use
         ServiceOfferingVO offering = _serviceOfferingDao.findByIdIncludingRemoved(vm.getServiceOfferingId());
         String plannerName = offering.getDeploymentPlanner();
         if (plannerName == null) {
-            if (vm.getHypervisorType() != HypervisorType.BareMetal) {
+            if (vm.getHypervisorType() == HypervisorType.BareMetal) {
                 plannerName = "BareMetalPlanner";
             } else {
                 plannerName = _configDao.getValue(Config.VmDeploymentPlanner.key());


Mime
View raw message