BBlack has submitted this change and it was merged.
Change subject: move parsoid applayer backends from $active_nodes to $backends
......................................................................
move parsoid applayer backends from $active_nodes to $backends
Change-Id: I615adcb23ebf769fc69b479909da36d7bdfe1fb2
---
M modules/role/manifests/cache/configuration.pp
M modules/role/manifests/cache/parsoid.pp
2 files changed, 23 insertions(+), 23 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/manifests/cache/configuration.pp
b/modules/role/manifests/cache/configuration.pp
index 4c575f9..139488d 100644
--- a/modules/role/manifests/cache/configuration.pp
+++ b/modules/role/manifests/cache/configuration.pp
@@ -146,15 +146,6 @@
'esams' => [],
'ulsfo' => [],
},
- 'cxserver' => {
- 'eqiad' => 'cxserver.svc.eqiad.wmnet',
- },
- 'citoid' => {
- 'eqiad' => 'citoid.svc.eqiad.wmnet',
- },
- 'restbase' => {
- 'eqiad' => 'restbase.svc.eqiad.wmnet',
- },
},
'labs' => {
'api' => {
@@ -174,12 +165,6 @@
},
'parsoid' => {
'eqiad' => '127.0.0.1',
- },
- 'cxserver' => {
- 'eqiad' => 'cxserver-beta.wmflabs.org',
- },
- 'citoid' => {
- 'eqiad' => 'citoid.wmflabs.org',
},
},
}
@@ -285,7 +270,16 @@
'test_appservers' => {
'eqiad' => [ 'mw1017.eqiad.wmnet' ],
},
- 'parsoid' =>
$lvs::configuration::lvs_service_ips['production']['parsoid']
+ 'parsoid' =>
$lvs::configuration::lvs_service_ips['production']['parsoid'],
+ 'cxserver' => {
+ 'eqiad' => 'cxserver.svc.eqiad.wmnet',
+ },
+ 'citoid' => {
+ 'eqiad' => 'citoid.svc.eqiad.wmnet',
+ },
+ 'restbase' => {
+ 'eqiad' => 'restbase.svc.eqiad.wmnet',
+ },
},
'labs' => {
'appservers' => {
@@ -323,7 +317,13 @@
},
'parsoid' => {
'eqiad' => [ '10.68.16.120' ], # deployment-parsoid05
- }
+ },
+ 'cxserver' => {
+ 'eqiad' => 'cxserver-beta.wmflabs.org',
+ },
+ 'citoid' => {
+ 'eqiad' => 'citoid.wmflabs.org',
+ },
}
}
}
diff --git a/modules/role/manifests/cache/parsoid.pp
b/modules/role/manifests/cache/parsoid.pp
index a89d88a..2d05599 100644
--- a/modules/role/manifests/cache/parsoid.pp
+++ b/modules/role/manifests/cache/parsoid.pp
@@ -39,9 +39,9 @@
storage => $storage_conf,
directors => {
'backend' =>
$::role::cache::configuration::backends[$::realm]['parsoid'][$::mw_primary],
- 'cxserver_backend' =>
$::role::cache::configuration::active_nodes[$::realm]['cxserver'][$::site],
- 'citoid_backend' =>
$::role::cache::configuration::active_nodes[$::realm]['citoid'][$::site],
- 'restbase_backend' =>
$::role::cache::configuration::active_nodes[$::realm]['restbase'][$::site],
+ 'cxserver_backend' =>
$::role::cache::configuration::backends[$::realm]['cxserver'][$::site],
+ 'citoid_backend' =>
$::role::cache::configuration::backends[$::realm]['citoid'][$::site],
+ 'restbase_backend' =>
$::role::cache::configuration::backends[$::realm]['restbase'][$::site],
},
director_options => {
'retries' => 2,
@@ -84,9 +84,9 @@
admin_port => 6082,
directors => {
'backend' =>
$::role::cache::configuration::active_nodes[$::realm]['parsoid'][$::site],
- 'cxserver_backend' =>
$::role::cache::configuration::active_nodes[$::realm]['cxserver'][$::site],
- 'citoid_backend' =>
$::role::cache::configuration::active_nodes[$::realm]['citoid'][$::site],
- 'restbase_backend' =>
$::role::cache::configuration::active_nodes[$::realm]['restbase'][$::site],
+ 'cxserver_backend' =>
$::role::cache::configuration::backends[$::realm]['cxserver'][$::site],
+ 'citoid_backend' =>
$::role::cache::configuration::backends[$::realm]['citoid'][$::site],
+ 'restbase_backend' =>
$::role::cache::configuration::backends[$::realm]['restbase'][$::site],
},
director_type => 'chash',
director_options => {
--
To view, visit https://gerrit.wikimedia.org/r/204046
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I615adcb23ebf769fc69b479909da36d7bdfe1fb2
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
