Muehlenhoff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/240310
Change subject: Fix definition of deployable networks
......................................................................
Fix definition of deployable networks
The srange of the ferm service was specified as a Puppet array, but needs
to be provided in a network definition in Ferm syntax.
This fixes the error spotted in Gerrit review 240083
Bug: T113351
Change-Id: Ib4bdfb8ac0fd0ed7145081e7ea68c82e2e255a6c
---
M manifests/role/deployment.pp
M modules/base/templates/firewall/defs.erb
2 files changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/10/240310/1
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index c7263ce..5125319 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -48,7 +48,7 @@
desc => 'http on trebuchet deployment servers, for serving actual
files to deploy',
proto => 'tcp',
port => '80',
- srange => $deployable_networks,
+ srange => '$DEPLOYABLE_NETWORKS',
}
#T83854
diff --git a/modules/base/templates/firewall/defs.erb
b/modules/base/templates/firewall/defs.erb
index 0aab1ec..a27f37f 100644
--- a/modules/base/templates/firewall/defs.erb
+++ b/modules/base/templates/firewall/defs.erb
@@ -5,12 +5,14 @@
special_hosts = scope.lookupvar('network::constants::special_hosts')
analytics_networks = scope.lookupvar('network::constants::analytics_networks')
mw_appserver_networks =
scope.lookupvar('network::constants::mw_appserver_networks')
+deployable_networks =
scope.lookupvar('network::constants::deployable_networks')
-%>
@def $EXTERNAL_NETWORKS = (<%- external_networks.each do |external_net| -%><%=
external_net %> <% end -%>);
@def $ALL_NETWORKS = (<%- all_networks.each do |net| -%><%= net %> <% end -%>);
@def $ANALYTICS_NETWORKS = (<%- analytics_networks.each do |net| -%><%= net %>
<% end -%>);
@def $MW_APPSERVER_NETWORKS = (<%- mw_appserver_networks.each do |net| -%><%=
net %> <% end -%>);
+@def $DEPLOYABLE_NETWORKS = (<%- deployable_networks.each do |net| -%><%= net
%> <% end -%>);
<%- special_hosts.sort.map do |realm, services | -%>
<%- if @realm != realm then next end -%>
--
To view, visit https://gerrit.wikimedia.org/r/240310
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4bdfb8ac0fd0ed7145081e7ea68c82e2e255a6c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
