diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 9f7107cde96..0aa1182b95a 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -1670,7 +1670,12 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag SearchCriteria sc = sb.create(); if (!isSystem) { - sc.setJoinParameters("networkOfferingSearch", "systemOnly", false); + if (zoneId != null) { + DataCenterVO dc = _dcDao.findById(zoneId); + if (dc != null && !dc.isSecurityGroupEnabled()) { + sc.setJoinParameters("networkOfferingSearch", "systemOnly", false); + } + } } else { sc.setJoinParameters("networkOfferingSearch", "systemOnly", true); sc.setJoinParameters("zoneSearch", "networkType", NetworkType.Advanced.toString());