apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

don't break basic zone mode

Browse Source
This commit is contained in:
Edison Su 2011-02-25 22:31:38 -05:00
parent 8240ae7e8c
commit 0e90ede56a
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/vm/network/security_group.py
View File

@ -90,6 +90,7 @@ def ipset(ipsetname, proto, start, end, ips):
def destroy_network_rules_for_vm(vm_name):
vmchain = vm_name
vmchain_default = None
delete_rules_for_vm_in_bridge_firewall_chain(vm_name)
if vm_name.startswith('i-') or vm_name.startswith('r-'):
@ -98,13 +99,23 @@ def destroy_network_rules_for_vm(vm_name):
destroy_ebtables_rules(vmchain)
try:
execute("iptables -F " + vmchain_default)
execute("iptables -X " + vmchain_default)
if vmchain_default != None:
execute("iptables -F " + vmchain_default)
except:
logging.exception("Ignoring failure to delete chain " + vmchain_default)
logging.debug("Ignoring failure to delete chain " + vmchain_default)
try:
if vmchain_default != None:
execute("iptables -X " + vmchain_default)
except:
logging.debug("Ignoring failure to delete chain " + vmchain_default)
try:
execute("iptables -F " + vmchain)
except:
logging.debug("Ignoring failure to delete chain " + vmchain)
try:
execute("iptables -X " + vmchain)
except:
logging.debug("Ignoring failure to delete chain " + vmchain)

2
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -1584,7 +1584,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
throw new InvalidParameterValueException("Unable to find zone by id " + zoneId);
}
if (zone.isSecurityGroupEnabled() && forVirtualNetwork) {
if (zone.isSecurityGroupEnabled() && zone.getNetworkType() != DataCenter.NetworkType.Basic && forVirtualNetwork) {
throw new InvalidParameterValueException("Can't add virtual network into a zone with security group enabled");
}