BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/389740 )
Change subject: ulsfo definition fixups
......................................................................
ulsfo definition fixups
Stuff noticed while staring at ulsfo metadata for eqsin commits:
The site-selection by address range should use the whole public
subnet, and cache_misc shouldn't exist for ulsfo in conftool-data
anymore.
Change-Id: I4e58c993cea62c43aafe467dfa74b21fcc53b92e
---
M conftool-data/service/cache.yaml
M manifests/realm.pp
2 files changed, 1 insertion(+), 3 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/conftool-data/service/cache.yaml b/conftool-data/service/cache.yaml
index cb6157c..462d09b 100644
--- a/conftool-data/service/cache.yaml
+++ b/conftool-data/service/cache.yaml
@@ -79,7 +79,6 @@
- codfw
- eqiad
- esams
- - ulsfo
nginx:
port: 443
default_values:
@@ -89,4 +88,3 @@
- codfw
- eqiad
- esams
- - ulsfo
diff --git a/manifests/realm.pp b/manifests/realm.pp
index 7777739..5319fef 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -10,7 +10,7 @@
/^10\.6[48]\./ => 'eqiad',
/^10\.19[26]\./ => 'codfw',
/^91\.198\.174\./ => 'esams',
- /^198\.35\.26\.([0-9]|[1-5][0-9]|6[0-2])/ => 'ulsfo',
+ /^198\.35\.26\./ => 'ulsfo',
/^10\.128\./ => 'ulsfo',
/^10\.20\.0\./ => 'esams',
default => '(undefined)'
--
To view, visit https://gerrit.wikimedia.org/r/389740
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4e58c993cea62c43aafe467dfa74b21fcc53b92e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
