jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/351132 )
Change subject: Enable EtcdConfig in production
......................................................................
Enable EtcdConfig in production
Ideally, Iae175401da8d should be present before deployment, but failing
that, the relevant variables can just be set to false instead of null.
Before this change is deployed, I3391f700328cdf02d should be merged and
deployed, and the etcd keys initialised.
Bug: T156924
Change-Id: I74b332c6c4af72085bd21479009ff2f2dadbb9eb
---
M wmf-config/CommonSettings.php
1 file changed, 2 insertions(+), 7 deletions(-)
Approvals:
Tim Starling: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 86ddc58..12cbab9 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -99,13 +99,8 @@
# Shorthand when we have no master-slave situation to keep into account
$wmfLocalServices = $wmfAllServices[$wmfDatacenter];
-# Labs-only for testing, eventually etcd.php will be used in production as well
-if ( $wmfRealm === 'labs' ) {
- # Get configuration from etcd. This gives us the correct
$wmfMasterDatacenter
- require "$wmfConfigDir/etcd.php";
-} else {
- $wmfMasterDatacenter = 'codfw';
-}
+# Get configuration from etcd. This gives us the correct $wmfMasterDatacenter
+require "$wmfConfigDir/etcd.php";
$wmfMasterServices = $wmfAllServices[$wmfMasterDatacenter];
--
To view, visit https://gerrit.wikimedia.org/r/351132
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I74b332c6c4af72085bd21479009ff2f2dadbb9eb
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Tim Starling <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Tim Starling <[email protected]>
Gerrit-Reviewer: Volans <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
