Lcarr has submitted this change and it was merged.
Change subject: adding ulsfo ip information
......................................................................
adding ulsfo ip information
Change-Id: I6b941dbe3ac13bce57122f3e70b6369a4c646326
---
M manifests/realm.pp
1 file changed, 9 insertions(+), 7 deletions(-)
Approvals:
Lcarr: Looks good to me, approved
RobH: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/manifests/realm.pp b/manifests/realm.pp
index 7c31dad..ede1cdc 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -15,7 +15,7 @@
}
# TODO: redo this in a much better way
-$all_prefixes = [ "208.80.152.0/22", "91.198.174.0/24" ]
+$all_prefixes = [ "208.80.152.0/22", "91.198.174.0/24", "198.35.26.0/23",
"185.15.56.0/22" ]
# Determine the site the server is in
if $::ipaddress_eth0 != undef {
@@ -27,12 +27,14 @@
}
$site = $main_ipaddress ? {
- /^208\.80\.15[23]\./ => "pmtpa",
- /^208\.80\.15[45]\./ => "eqiad",
- /^10\.[0-4]\./ => "pmtpa",
- /^10\.6[48]\./ => "eqiad",
- /^91\.198\.174\./ => "esams",
- default => "(undefined)"
+ /^208\.80\.15[23]\./ => "pmtpa",
+ /^208\.80\.15[45]\./ => "eqiad",
+ /^10\.[0-4]\./ => "pmtpa",
+ /^10\.6[48]\./ => "eqiad",
+ /^91\.198\.174\./ => "esams",
+ /^198\.35\.26\.([0-9]|[1-5][0-9]|6[0-2])/ => "ulsfo",
+ /^10\.128\./ => "ulsfo",
+ default => "(undefined)"
}
$mw_primary = $::realm ? {
--
To view, visit https://gerrit.wikimedia.org/r/85911
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b941dbe3ac13bce57122f3e70b6369a4c646326
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Lcarr <[email protected]>
Gerrit-Reviewer: Lcarr <[email protected]>
Gerrit-Reviewer: RobH <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
