Alexandros Kosiaris has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/302695 )
Change subject: Move external_networks to network module data.yaml
......................................................................
Move external_networks to network module data.yaml
Use the data.yaml file to populate realm independently the
external_networks variable.
Change-Id: I92ca10fd86649ecf5dc6ce1006484bad83882faf
---
M modules/network/data/data.yaml
M modules/network/manifests/constants.pp
2 files changed, 9 insertions(+), 8 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/network/data/data.yaml b/modules/network/data/data.yaml
index e0681a9..8e2a2c2 100644
--- a/modules/network/data/data.yaml
+++ b/modules/network/data/data.yaml
@@ -1,3 +1,11 @@
+network::external:
+- 91.198.174.0/24
+- 208.80.152.0/22
+- 2620:0:860::/46
+- 198.35.26.0/23
+- 185.15.56.0/22
+- 2a02:ec80::/32
+
network::subnets:
production:
eqiad:
diff --git a/modules/network/manifests/constants.pp
b/modules/network/manifests/constants.pp
index e4b5847..d82323b 100644
--- a/modules/network/manifests/constants.pp
+++ b/modules/network/manifests/constants.pp
@@ -2,17 +2,10 @@
# Note this name is misleading. Most of these are "external" networks,
# but some subnets of the IPv6 space are not externally routed, even if
# they're externally route-able (the ones used for private vlans).
- $external_networks = [
- '91.198.174.0/24',
- '208.80.152.0/22',
- '2620:0:860::/46',
- '198.35.26.0/23',
- '185.15.56.0/22',
- '2a02:ec80::/32',
- ]
$module_path = get_module_path($module_name)
$network_data = loadyaml("${module_path}/data/data.yaml")
$all_network_subnets = $network_data['network::subnets']
+ $external_networks = $network_data['network::external']
# are you really sure you want to use this? maybe what you really
# the trusted/production networks. See $production_networks for this.
--
To view, visit https://gerrit.wikimedia.org/r/302695
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I92ca10fd86649ecf5dc6ce1006484bad83882faf
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
