BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/282150
Change subject: cache_misc: whitespace/comment/format cleanup
......................................................................
cache_misc: whitespace/comment/format cleanup
Change-Id: Ib6a4575868d6429f60932731de5683c798d7ad40
---
M modules/role/manifests/cache/misc.pp
1 file changed, 48 insertions(+), 45 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/50/282150/1
diff --git a/modules/role/manifests/cache/misc.pp
b/modules/role/manifests/cache/misc.pp
index c28d61e..3a2dc85 100644
--- a/modules/role/manifests/cache/misc.pp
+++ b/modules/role/manifests/cache/misc.pp
@@ -35,140 +35,140 @@
$app_directors = {
'analytics1027' => { # Hue (Hadoop GUI)
- 'dynamic' => 'no',
- 'type' => 'random',
+ 'dynamic' => 'no',
+ 'type' => 'random',
'backends' => ['analytics1027.eqiad.wmnet'],
'be_opts' => merge($app_def_be_opts, { 'port' => 8888 }),
},
'antimony' => {
- 'dynamic' => 'no',
- 'type' => 'random',
+ 'dynamic' => 'no',
+ 'type' => 'random',
'backends' => ['antimony.wikimedia.org'],
'be_opts' => merge($app_def_be_opts, { 'port' => 8080 }),
},
'bromine' => { # ganeti VM for misc. static HTML sites
- 'dynamic' => 'no',
- 'type' => 'random',
+ 'dynamic' => 'no',
+ 'type' => 'random',
'backends' => ['bromine.eqiad.wmnet'],
'be_opts' => $app_def_be_opts,
},
'bohrium' => {
- 'dynamic' => 'no',
- 'type' => 'random',
+ 'dynamic' => 'no',
+ 'type' => 'random',
'backends' => ['bohrium.eqiad.wmnet'],
'be_opts' => $app_def_be_opts,
},
'californium' => {
- 'dynamic' => 'no',
- 'type' => 'random',
+ 'dynamic' => 'no',
+ 'type' => 'random',
'backends' => ['californium.wikimedia.org'],
'be_opts' => $app_def_be_opts,
},
'labtestweb2001' => {
- 'dynamic' => 'no',
- 'type' => 'random',
+ 'dynamic' => 'no',
+ 'type' => 'random',
'backends' => ['labtestweb2001.wikimedia.org'],
'be_opts' => $app_def_be_opts,
},
'dataset1001' => {
- 'dynamic' => 'no',
- 'type' => 'random',
+ 'dynamic' => 'no',
+ 'type' => 'random',
'backends' => ['dataset1001.wikimedia.org'],
'be_opts' => $app_def_be_opts,
},
'etherpad1001' => {
- 'dynamic' => 'no',
- 'type' => 'random',
+ 'dynamic' => 'no',
+ 'type' => 'random',
'backends' => ['etherpad1001.eqiad.wmnet'],
'be_opts' => merge($app_def_be_opts, { 'port' => 9001 }),
},
'gallium' => { # CI server
- 'dynamic' => 'no',
- 'type' => 'random',
+ 'dynamic' => 'no',
+ 'type' => 'random',
'backends' => ['gallium.wikimedia.org' ],
'be_opts' => $app_def_be_opts,
},
'graphite1001' => {
- 'dynamic' => 'no',
- 'type' => 'random',
+ 'dynamic' => 'no',
+ 'type' => 'random',
'backends' => ['graphite1001.eqiad.wmnet'],
'be_opts' => $app_def_be_opts,
},
'iridium' => { # main phab
- 'dynamic' => 'no',
- 'type' => 'random',
+ 'dynamic' => 'no',
+ 'type' => 'random',
'backends' => ['iridium.eqiad.wmnet'],
'be_opts' => $app_def_be_opts,
},
'krypton' => { # ganeti VM for misc. PHP apps
- 'dynamic' => 'no',
- 'type' => 'random',
+ 'dynamic' => 'no',
+ 'type' => 'random',
'backends' => ['krypton.eqiad.wmnet'],
'be_opts' => $app_def_be_opts,
},
'magnesium' => { # RT and racktables
- 'dynamic' => 'no',
- 'type' => 'random',
+ 'dynamic' => 'no',
+ 'type' => 'random',
'backends' => ['magnesium.wikimedia.org'],
'be_opts' => $app_def_be_opts,
},
'netmon1001' => { # servermon
- 'dynamic' => 'no',
- 'type' => 'random',
+ 'dynamic' => 'no',
+ 'type' => 'random',
'backends' => ['netmon1001.wikimedia.org'],
'be_opts' => $app_def_be_opts,
},
'noc' => { # noc.wikimedia.org and dbtree.wikimedia.org
- 'dynamic' => 'no',
- 'type' => 'random',
+ 'dynamic' => 'no',
+ 'type' => 'random',
'backends' => ['mw1152.eqiad.wmnet'],
'be_opts' => $app_def_be_opts,
},
'palladium' => {
- 'dynamic' => 'no',
- 'type' => 'random',
+ 'dynamic' => 'no',
+ 'type' => 'random',
'backends' => ['palladium.eqiad.wmnet'],
'be_opts' => $app_def_be_opts,
},
'planet1001' => {
- 'dynamic' => 'no',
- 'type' => 'random',
+ 'dynamic' => 'no',
+ 'type' => 'random',
'backends' => ['planet1001.eqiad.wmnet'],
'be_opts' => $app_def_be_opts,
},
'ruthenium' => { # parsoid rt test server
- 'dynamic' => 'no',
- 'type' => 'random',
+ 'dynamic' => 'no',
+ 'type' => 'random',
'backends' => ['ruthenium.eqiad.wmnet'],
'be_opts' => merge($app_def_be_opts, { 'port' => 8001 }),
},
'rutherfordium' => { # people.wikimedia.org
- 'dynamic' => 'no',
- 'type' => 'random',
+ 'dynamic' => 'no',
+ 'type' => 'random',
'backends' => ['rutherfordium.eqiad.wmnet'],
'be_opts' => $app_def_be_opts,
},
'stat1001' => { # metrics and metrics-api
- 'dynamic' => 'no',
- 'type' => 'random',
+ 'dynamic' => 'no',
+ 'type' => 'random',
'backends' => ['stat1001.eqiad.wmnet'],
'be_opts' => $app_def_be_opts,
},
- 'mendelevium' => { # OTRS (search is really slow, hence bbt=60s below)
+ 'mendelevium' => { # OTRS
'dynamic' => 'no',
'type' => 'random',
'backends' => ['mendelevium.eqiad.wmnet'],
'be_opts' => $app_def_be_opts,
},
'ytterbium' => { # Gerrit
- 'dynamic' => 'no',
- 'type' => 'random',
+ 'dynamic' => 'no',
+ 'type' => 'random',
'backends' => ['ytterbium.wikimedia.org'],
'be_opts' => merge($app_def_be_opts, { 'port' => 8080 }),
},
'logstash_director' => {
'dynamic' => 'no',
- 'type' => 'hash', # maybe-wrong? but current value before this
commit! XXX
+ 'type' => 'hash', # maybe-wrong? but current value before this
commit! XXX
'backends' => [
'logstash1001.eqiad.wmnet',
'logstash1002.eqiad.wmnet',
@@ -179,7 +179,10 @@
'wdqs_director' => {
'dynamic' => 'no',
'type' => 'random',
- 'backends' => ['wdqs1001.eqiad.wmnet', 'wdqs1002.eqiad.wmnet'],
+ 'backends' => [
+ 'wdqs1001.eqiad.wmnet',
+ 'wdqs1002.eqiad.wmnet'
+ ],
'be_opts' => merge($app_def_be_opts, { 'probe' => 'wdqs' }),
},
}
--
To view, visit https://gerrit.wikimedia.org/r/282150
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6a4575868d6429f60932731de5683c798d7ad40
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
