Dzahn has submitted this change and it was merged.
Change subject: NTP, lucene - remove pmtpa remnants
......................................................................
NTP, lucene - remove pmtpa remnants
remove more pmpta remnants from NTP
and lucene roles
Change-Id: Ie01cab829a1c2c1a11ec1628f4bb8e0392fdbdd1
---
M manifests/role/lucene.pp
M manifests/role/ntp.pp
2 files changed, 1 insertion(+), 8 deletions(-)
Approvals:
Manybubbles: Looks good to me, but someone else must approve
Alexandros Kosiaris: Looks good to me, approved
John F. Lewis: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/manifests/role/lucene.pp b/manifests/role/lucene.pp
index 562621e..c8a8f4f 100644
--- a/manifests/role/lucene.pp
+++ b/manifests/role/lucene.pp
@@ -4,10 +4,6 @@
class configuration {
$nodes = {
'production' => {
- 'pmtpa' => {
- 'front_ends' => {},
- 'indexers' => {}
- },
'eqiad' => {
'front_ends' => {
# enwiki
diff --git a/manifests/role/ntp.pp b/manifests/role/ntp.pp
index dbfe02b..a579e90 100644
--- a/manifests/role/ntp.pp
+++ b/manifests/role/ntp.pp
@@ -14,7 +14,6 @@
'nescio.esams.wikimedia.org', # esams recdns
],
ulsfo => [],
- pmtpa => [],
}
# Combines the peers above into a single list
@@ -22,8 +21,7 @@
$wmf_peers['eqiad'],
$wmf_peers['codfw'],
$wmf_peers['esams'],
- $wmf_peers['ulsfo'],
- $wmf_peers['pmtpa']
+ $wmf_peers['ulsfo']
)
# NOTE to the future: we *should* be using regional
@@ -75,7 +73,6 @@
codfw => array_concat($wmf_peers['eqiad'], $wmf_peers['codfw']),
esams => array_concat($wmf_peers['esams'], $wmf_peers['eqiad']),
ulsfo => array_concat($wmf_peers['eqiad'], $wmf_peers['codfw']),
- pmtpa => array_concat($wmf_peers['eqiad'], $wmf_peers['codfw']),
}
# TODO: generate from $network::constants::all_networks
--
To view, visit https://gerrit.wikimedia.org/r/168730
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie01cab829a1c2c1a11ec1628f4bb8e0392fdbdd1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: John F. Lewis <[email protected]>
Gerrit-Reviewer: Manybubbles <[email protected]>
Gerrit-Reviewer: Matanya <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
