From 6c8c657e2b28348566545875f4a8f710a5713af6 Mon Sep 17 00:00:00 2001 From: frank Date: Wed, 4 Jan 2012 18:05:32 -0800 Subject: [PATCH] Bug 12777 - Add storage network configuration into CloudStack basic done --- .../storage/resource/NfsSecondaryStorageResource.java | 9 ++++++++- .../debian/config/etc/iptables/iptables-secstorage | 4 +++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java b/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java index 7f877af6a3d..cd507da0029 100755 --- a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java +++ b/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java @@ -114,6 +114,8 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S private String _localgw; private String _eth1mask; private String _eth1ip; + private String _storageIp; + private String _storageNetmask; final private String _parent = "/mnt/SecStorage"; final private String _tmpltDir = "/var/cloudstack/template"; final private String _tmpltpp = "template.properties"; @@ -555,7 +557,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S InetAddress nfsHostAddr = InetAddress.getByName(nfsHost); String nfsHostIp = nfsHostAddr.getHostAddress(); - addRouteToInternalIpOrCidr(_localgw, _eth1ip, _eth1mask, nfsHostIp); + addRouteToInternalIpOrCidr(_storageIp, _storageIp, _storageNetmask, nfsHostIp); String nfsPath = nfsHostIp + ":" + uri.getPath(); String dir = UUID.nameUUIDFromBytes(nfsPath.getBytes()).toString(); String root = _parent + "/" + dir; @@ -918,6 +920,11 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S _publicIp = (String) params.get("eth2ip"); _hostname = (String) params.get("name"); + _storageIp = (String) params.get("storageip"); + if (_storageIp == null) { + s_logger.warn("Wait, there is no storageip in /proc/cmdline, something wrong!"); + } + _storageNetmask = (String) params.get("storagenetmask"); super.configure(name, params); _params = params; diff --git a/patches/systemvm/debian/config/etc/iptables/iptables-secstorage b/patches/systemvm/debian/config/etc/iptables/iptables-secstorage index 5709d804547..7dec3455747 100755 --- a/patches/systemvm/debian/config/etc/iptables/iptables-secstorage +++ b/patches/systemvm/debian/config/etc/iptables/iptables-secstorage @@ -11,10 +11,12 @@ COMMIT :HTTP - [0:0] -A INPUT -i eth0 -m state --state RELATED,ESTABLISHED -j ACCEPT -A INPUT -i eth1 -m state --state RELATED,ESTABLISHED -j ACCEPT --A INPUT -i eth2 -m state --state RELATED,ESTABLISHED -j ACCEPT +-A INPUT -i eth2 -m state --state RELATED,ESTABLISHED -j ACCEPT +-A INPUT -i eth3 -m state --state RELATED,ESTABLISHED -j ACCEPT -A INPUT -i lo -j ACCEPT -A INPUT -p icmp --icmp-type 13 -j DROP -A INPUT -p icmp -j ACCEPT -A INPUT -i eth0 -p tcp -m state --state NEW --dport 3922 -j ACCEPT -A INPUT -i eth1 -p tcp -m state --state NEW --dport 3922 -j ACCEPT +-A INPUT -i eth3 -p tcp -m state --state NEW --dport 3922 -j ACCEPT COMMIT