BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/233438
Change subject: Switch codfw to tier2
......................................................................
Switch codfw to tier2
Bug: T110065
Change-Id: I46a9eb856dda3523c3a78c8e7a7f170ad8576434
---
M manifests/realm.pp
M manifests/role/ipsec.pp
2 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/38/233438/1
diff --git a/manifests/realm.pp b/manifests/realm.pp
index f8c4a66..94c536a1 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -39,7 +39,7 @@
$site_tier = $::realm ? {
production => $::site ? {
'eqiad' => 'one',
- 'codfw' => 'one',
+ 'codfw' => 'two', # temporary, see T110065
'esams' => 'two',
'ulsfo' => 'two',
},
diff --git a/manifests/role/ipsec.pp b/manifests/role/ipsec.pp
index ac168ef..fbc2eac 100644
--- a/manifests/role/ipsec.pp
+++ b/manifests/role/ipsec.pp
@@ -15,17 +15,17 @@
$ipsec_cluster = regsubst(hiera('cluster'), '_', '::ipsec::')
$cluster_nodes = hiera("${ipsec_cluster}::nodes")
# for 'left' nodes in cache sites, enumerate 'right' nodes in "main"
sites
- if $::site == 'esams' or $::site == 'ulsfo' {
- $targets = concat(
- $cluster_nodes['eqiad'],
- $cluster_nodes['codfw']
- )
+
+ # Note codfw tier2, which isn't controlled by $site_tier... T110065
+ if $::site == 'esams' or $::site == 'ulsfo' or $::site == 'codfw' {
+ $targets = $cluster_nodes['eqiad']
}
# for 'left' nodes in "main" sites, enumerate 'right' nodes in cache
sites
- if $::site == 'eqiad' or $::site == 'codfw' {
+ if $::site == 'eqiad' {
$targets = concat(
$cluster_nodes['esams'],
- $cluster_nodes['ulsfo']
+ $cluster_nodes['ulsfo'],
+ $cluster_nodes['codfw']
)
}
}
--
To view, visit https://gerrit.wikimedia.org/r/233438
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I46a9eb856dda3523c3a78c8e7a7f170ad8576434
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
