Mark Bergsma has submitted this change and it was merged.
Change subject: Configuration for beta cluster caches in eqiad
......................................................................
Configuration for beta cluster caches in eqiad
I have created the apache instances on eqiad.wmflabs as well as the
parsoid instance. This fill in missing bits in the huge configuration
hash.
Note eqiad labs does not have /dev/vdb (yet?) so the varnish persistent
storage are not going to work anyway.
Change-Id: I949aa6f5372e3f7c90c5858bb5238d5d9748ce97
---
M manifests/role/cache.pp
1 file changed, 45 insertions(+), 8 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 7336ddb..a902b1e 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -125,12 +125,30 @@
}
},
'labs' => {
- 'api' => { 'pmtpa' => '127.0.0.1', },
- 'bits' => { 'pmtpa' => '127.0.0.1', },
- 'mobile' => { 'pmtpa' => '127.0.0.1', },
- 'text' => { 'pmtpa' => '127.0.0.1', },
- 'upload' => { 'pmtpa' => '127.0.0.1', },
- 'parsoid' => { 'pmtpa' => '127.0.0.1', },
+ 'api' => {
+ 'eqiad' => '127.0.0.1',
+ 'pmtpa' => '127.0.0.1',
+ },
+ 'bits' => {
+ 'eqiad' => '127.0.0.1',
+ 'pmtpa' => '127.0.0.1',
+ },
+ 'mobile' => {
+ 'eqiad' => '127.0.0.1',
+ 'pmtpa' => '127.0.0.1',
+ },
+ 'text' => {
+ 'eqiad' => '127.0.0.1',
+ 'pmtpa' => '127.0.0.1',
+ },
+ 'upload' => {
+ 'eqiad' => '127.0.0.1',
+ 'pmtpa' => '127.0.0.1',
+ },
+ 'parsoid' => {
+ 'eqiad' => '127.0.0.1',
+ 'pmtpa' => '127.0.0.1',
+ },
},
}
@@ -335,37 +353,56 @@
},
'labs' => {
'appservers' => {
+ 'eqiad' => [
+ '10.68.16.74', # deployment-apache01
+ '10.68.16.11', # deployment-apache02
+ ],
'pmtpa' => [
'10.4.0.166', # deployment-apache32
'10.4.0.187', # deployment-apache33
],
},
'api' => {
+ 'eqiad' => [
+ '10.68.16.74', # deployment-apache01
+ '10.68.16.11', # deployment-apache02
+ ],
'pmtpa' => [
'10.4.0.166', # deployment-apache32
'10.4.0.187', # deployment-apache33
],
},
'bits' => {
+ # FIXME does eqiad.wmflabs needs that?
'pmtpa' => "10.4.0.252",
},
'bits_appservers' => {
+ 'eqiad' => [
+ '10.68.16.74', # deployment-apache01
+ '10.68.16.11', # deployment-apache02
+ ],
'pmtpa' => [
'10.4.0.166', # deployment-apache32
'10.4.0.187', # deployment-apache33
],
},
'rendering' => {
+ 'eqiad' => [
+ '10.68.16.74', # deployment-apache01
+ '10.68.16.11', # deployment-apache02
+ ],
'pmtpa' => [
'10.4.0.166', # deployment-apache32
'10.4.0.187', # deployment-apache33
],
},
'test_appservers' => {
- 'pmtpa' => [ '10.4.0.166' ],
+ 'eqiad' => [ '10.68.16.74' ], # deployment-apache01
+ 'pmtpa' => [ '10.4.0.166' ], # deployment-apache32
},
'parsoid' => {
- 'pmtpa' => [ '10.4.1.121' ], # deployment-parsoid2
+ 'eqiad' => [ '10.68.16.17' ], # deployment-parsoid04
+ 'pmtpa' => [ '10.4.1.121' ], # deployment-parsoid2
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/115629
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I949aa6f5372e3f7c90c5858bb5238d5d9748ce97
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
