remove wrong storage network ip checking when setting internal ip route in NFS secondary

frank · frank · commit a7b77f33169f · 2012-09-07T11:03:01.000-07:00
storage resource.

The bug prevent vmware setting static route to vcenter
diff --git a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java b/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
@@ -124,6 +124,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
 	private String _storageIp;
 	private String _storageNetmask;
 	private String _storageGateway;
+	private List<String> nfsIps = new ArrayList<String>();
 	final private String _parent = "/mnt/SecStorage";
 	final private String _tmpltDir = "/var/cloudstack/template";
     final private String _tmpltpp = "template.properties";
@@ -611,6 +612,7 @@ private Answer execute(SecStorageSetupCommand cmd) {
 
             configCerts(cmd.getCerts());
             
+            nfsIps.add(nfsHostIp);
             return new SecStorageSetupAnswer(dir);
         } catch (Exception e) {
             String msg = "GetRootDir for " + secUrl + " failed due to " + e.toString();
@@ -730,6 +732,13 @@ private Answer execute(SecStorageVMSetupCommand cmd) {
 		boolean success = true;
 		StringBuilder result = new StringBuilder();
 		for (String cidr: cmd.getAllowedInternalSites()) {
+			if (nfsIps.contains(cidr)) {
+				/*
+				 * if the internal download ip is the same with secondary storage ip, adding internal sites will flush
+				 * ip route to nfs through storage ip. 
+				 */
+				continue;
+			}
 			String tmpresult = allowOutgoingOnPrivate(cidr);
 			if (tmpresult != null) {
 				result.append(", ").append(tmpresult);
@@ -814,10 +823,7 @@ public String allowOutgoingOnPrivate(String destCidr) {
     		return "Error in allowing outgoing to " + destCidr + ", err=" + result;
     	}
     	
-    	if (_storageIp == null) {
-    	    /* only set route when no storage network present */
-    	    addRouteToInternalIpOrCidr(_localgw, _eth1ip, _eth1mask, destCidr);
-    	}
+    	addRouteToInternalIpOrCidr(_localgw, _eth1ip, _eth1mask, destCidr);
     	
     	return null;
 	}
