etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.16'

This commit is contained in:
nvazquez 2022-04-06 00:19:12 -03:00
parent e4b6992def c61ea9f96d
commit 306baea228
No known key found for this signature in database
GPG Key ID: 656E1BCC8CB54F84
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
systemvm/debian/opt/cloud/bin/configure.py
View File

@ -162,6 +162,7 @@ class CsAcl(CsDataBag):
" -A FIREWALL_%s" % self.ip +
" -s %s " % cidr +
" -p %s " % rule['protocol'] +
" -m %s " % rule['protocol'] +
" %s -j %s" % (rnge, self.rule['action'])])
sflag = False

2
systemvm/debian/opt/cloud/bin/cs/CsAddress.py
View File

@ -498,7 +498,7 @@ class CsIP:
if not inf.startswith("eth"):
continue
for address in addresses:
if "nw_type" in address and address["nw_type"] == "guest":
if "nw_type" in address and address["nw_type"] == "guest" and address["add"]:
self.fw.append(["filter", "front", "-A FORWARD -s %s -d %s -j ACL_INBOUND_%s" %
(address["network"], self.address["network"], self.dev)])
self.fw.append(["filter", "front", "-A FORWARD -s %s -d %s -j ACL_INBOUND_%s" %