Github user wilderrodrigues commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/887#discussion_r40450011
--- Diff: server/src/com/cloud/network/firewall/FirewallManagerImpl.java ---
@@ -426,7 +426,8 @@ public void detectRulesConflict(FirewallRule newRule)
throws NetworkRuleConflict
// we allow port forwarding rules with the same parameters
but different protocols
boolean allowPf =
(rule.getPurpose() == Purpose.PortForwarding &&
newRule.getPurpose() == Purpose.PortForwarding &&
!newRule.getProtocol().equalsIgnoreCase(
- rule.getProtocol()));
+ rule.getProtocol())) || (rule.getPurpose() ==
Purpose.Vpn && newRule.getPurpose() == Purpose.PortForwarding &&
!newRule.getProtocol().equalsIgnoreCase(
+ rule.getProtocol()));
--- End diff --
I didn't do that or looked int it. We isolated our 35 hours of effort to
get master up and running again. So, this can be fixed in a separate PR.
Cheers,
Wilder
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
