diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index ed55d59d753..30374335fd8 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -702,7 +702,10 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura String checkPodCIDRs = _configDao.getValue("check.pod.cidrs"); if (checkPodCIDRs == null || checkPodCIDRs.trim().isEmpty() || Boolean.parseBoolean(checkPodCIDRs)) { checkPodCidrSubnets(zoneId, podId, cidr); - checkCidrVlanOverlap(zoneId, cidr); + /* Commenting out due to Bug 11593 - CIDR conflicts with zone when extending pod but not when creating it + * + * checkCidrVlanOverlap(zoneId, cidr); + */ } Grouping.AllocationState allocationState = null;