Check MIGRATE_VM_ACROSS_CLUSTERS in zone setting

Author: ustcweizhou

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -3335,7 +3335,7 @@ public boolean checkIfVmHasClusterWideVolumes(Long vmId) {
 
     @Override
     public DataCenterDeployment getMigrationDeployment(final Long vmId, final Host host, final Long poolId, final ExcludeList excludes) {
-        if (MIGRATE_VM_ACROSS_CLUSTERS.value() && !checkIfVmHasClusterWideVolumes(vmId)) {
+        if (MIGRATE_VM_ACROSS_CLUSTERS.valueIn(host.getDataCenterId()) && !checkIfVmHasClusterWideVolumes(vmId)) {
             s_logger.info("Searching for hosts in the zone for vm migration");
             List<Long> clustersToExcluded = _clusterDao.listAllClusters(host.getDataCenterId());
             List<ClusterVO> clusterList = _clusterDao.listByDcHyType(host.getDataCenterId(), host.getHypervisorType().toString());

server/src/main/java/com/cloud/resource/ResourceManagerImpl.java

@@ -1266,7 +1266,7 @@ private boolean doMaintain(final long hostId) {
             List<HostVO> hosts = listAllUpAndEnabledHosts(Host.Type.Routing, host.getClusterId(), host.getPodId(), host.getDataCenterId());
             if (hosts == null || hosts.isEmpty()) {
                 s_logger.warn("Unable to find a host for vm migration in cluster: " + host.getClusterId());
-                if (MIGRATE_VM_ACROSS_CLUSTERS.value()) {
+                if (MIGRATE_VM_ACROSS_CLUSTERS.valueIn(host.getDataCenterId())) {
                     s_logger.info("Looking for hosts across different clusters in zone: " + host.getDataCenterId());
                     hosts = listAllUpAndEnabledHosts(Host.Type.Routing, null, null, host.getDataCenterId());
                     if (hosts == null || hosts.isEmpty()) {