From 8ff2061db7995abddac6865034d54abf36a8c93f Mon Sep 17 00:00:00 2001
From: Min Chen <min.chen@citrix.com>
Date: Fri, 2 Aug 2013 17:59:24 -0700
Subject: [PATCH] CLOUDSTACK-4040: [Object_store_refactor] System VMs are not
 spinning up if S3 storage configuration is not part of zone creation wizard.

---
 server/src/com/cloud/resource/ResourceManagerImpl.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
index 61150261c8b..beb5f4e50e2 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -2411,7 +2411,9 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
             sc.addAnd(sc.getEntity().getDataCenterId(), Op.EQ, zoneId);
         }
         if (hostId != null) {
-            sc.addAnd(sc.getEntity().getId(), Op.EQ, hostId);
+            // exclude the given host, since we want to check what hypervisor is already handled
+            // in adding this new host
+            sc.addAnd(sc.getEntity().getId(), Op.NEQ, hostId);
         }
         sc.addAnd(sc.getEntity().getType(), Op.EQ, Host.Type.Routing);
         List<HostVO> hosts = sc.list();