Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Introduce $::networks::constants::labs_networks
......................................................................
Introduce $::networks::constants::labs_networks
In the spirit of $networks and $production_networks, introduce
labs_networks which is bound to always contain the set of all las
related network subnets
Change-Id: Ib740fdb7f267f3edd835aed76ab46a8612dfd289
---
M modules/base/templates/firewall/defs.erb
M modules/network/manifests/constants.pp
2 files changed, 5 insertions(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/modules/base/templates/firewall/defs.erb
b/modules/base/templates/firewall/defs.erb
index 8e0691e..9961679 100644
--- a/modules/base/templates/firewall/defs.erb
+++ b/modules/base/templates/firewall/defs.erb
@@ -5,6 +5,7 @@
all_network_subnets =
scope.lookupvar('network::constants::all_network_subnets')
special_hosts = scope.lookupvar('network::constants::special_hosts')
production_networks =
scope.lookupvar('network::constants::production_networks')
+labs_networks = scope.lookupvar('network::constants::production_labs')
analytics_networks = scope.lookupvar('network::constants::analytics_networks')
mw_appserver_networks =
scope.lookupvar('network::constants::mw_appserver_networks')
-%>
@@ -18,6 +19,8 @@
# $PRODUCTION_NETWORKS is a set of all production networks
@def $PRODUCTION_NETWORKS = (<%- production_networks.each do |net| -%><%= net
%> <% end -%>);
+# $LABS_NETWORKS is meant to be a set of all labs networks
+@def $LABS_NETWORKS = (<%- labs_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 -%>);
diff --git a/modules/network/manifests/constants.pp
b/modules/network/manifests/constants.pp
index 11357e0..b27a576 100644
--- a/modules/network/manifests/constants.pp
+++ b/modules/network/manifests/constants.pp
@@ -23,6 +23,8 @@
$domain_networks = slice_network_constants($::realm)
# $production_networks will always contain just the production networks
$production_networks = slice_network_constants('production')
+ # $labs_networks will always contain just the labs networks
+ $labs_networks = slice_network_constants('labs')
$special_hosts = {
'production' => {
--
To view, visit https://gerrit.wikimedia.org/r/296376
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib740fdb7f267f3edd835aed76ab46a8612dfd289
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
