Tim Starling has uploaded a new change for review. (
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.
Change-Id: I74b332c6c4af72085bd21479009ff2f2dadbb9eb
---
M wmf-config/CommonSettings.php
1 file changed, 2 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/32/351132/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 2794a57..09ea4b0 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: newchange
Gerrit-Change-Id: I74b332c6c4af72085bd21479009ff2f2dadbb9eb
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Tim Starling <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
