Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/295332
Change subject: ferm: Kill INTERNAL_V4/INTERNAL_V6 definitions
......................................................................
ferm: Kill INTERNAL_V4/INTERNAL_V6 definitions
Not used anywhere and not really helpful anyway as it turned out
Also we should never distinguish IPv4 from IPv6 and treat them
differently. At least not on such a generic basis
Change-Id: Ica387e2f95fb906035e119129730fd5e5c5ea8e9
---
M modules/base/templates/firewall/defs.erb
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/32/295332/1
diff --git a/modules/base/templates/firewall/defs.erb
b/modules/base/templates/firewall/defs.erb
index 8ae30de..6aa11d8 100644
--- a/modules/base/templates/firewall/defs.erb
+++ b/modules/base/templates/firewall/defs.erb
@@ -10,9 +10,7 @@
mw_appserver_networks =
scope.lookupvar('network::constants::mw_appserver_networks')
-%>
-@def $INTERNAL_V4 = (10.0.0.0/8);
-@def $INTERNAL_V6 = (2620:0:860:100::/56 2620:0:861:100::/56
2620:0:862:100::/56 2620:0:863:100::/56);
-@def $INTERNAL = ($INTERNAL_V4 $INTERNAL_V6);
+@def $INTERNAL = (10.0.0.0/8 2620:0:860:100::/56 2620:0:861:100::/56
2620:0:862:100::/56 2620:0:863:100::/56);
@def $EXTERNAL_NETWORKS = (<%- external_networks.each do |external_net| -%><%=
external_net %> <% end -%>);
@def $ALL_NETWORKS = (<%- all_networks.each do |net| -%><%= net %> <% end -%>);
--
To view, visit https://gerrit.wikimedia.org/r/295332
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica387e2f95fb906035e119129730fd5e5c5ea8e9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
