[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Enable EtcdConfig in production"

2017-05-02 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/351550 )

Change subject: Revert "Enable EtcdConfig in production"
..


Revert "Enable EtcdConfig in production"

This reverts commit 713f6474acf63d2524cdd131ffb849e72ca2fe62.

Change-Id: I795cbd60ef3dc5c5bd5ec961f7674be2d2db7826
---
M wmf-config/CommonSettings.php
1 file changed, 7 insertions(+), 2 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 12cbab9..86ddc58 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -99,8 +99,13 @@
 # Shorthand when we have no master-slave situation to keep into account
 $wmfLocalServices = $wmfAllServices[$wmfDatacenter];
 
-# Get configuration from etcd. This gives us the correct $wmfMasterDatacenter
-require "$wmfConfigDir/etcd.php";
+# 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';
+}
 
 $wmfMasterServices = $wmfAllServices[$wmfMasterDatacenter];
 

-- 
To view, visit https://gerrit.wikimedia.org/r/351550
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I795cbd60ef3dc5c5bd5ec961f7674be2d2db7826
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Enable EtcdConfig in production"

2017-05-02 Thread Tim Starling (Code Review) 
Hello Giuseppe Lavagetto, Krinkle, Brion VIBBER, jenkins-bot, Volans,

I'd like you to do a code review.  Please visit

https://gerrit.wikimedia.org/r/351550

to review the following change.


Change subject: Revert "Enable EtcdConfig in production"
..

Revert "Enable EtcdConfig in production"

This reverts commit 713f6474acf63d2524cdd131ffb849e72ca2fe62.

Change-Id: I795cbd60ef3dc5c5bd5ec961f7674be2d2db7826
---
M wmf-config/CommonSettings.php
1 file changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/50/351550/1

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 12cbab9..86ddc58 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -99,8 +99,13 @@
 # Shorthand when we have no master-slave situation to keep into account
 $wmfLocalServices = $wmfAllServices[$wmfDatacenter];
 
-# Get configuration from etcd. This gives us the correct $wmfMasterDatacenter
-require "$wmfConfigDir/etcd.php";
+# 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';
+}
 
 $wmfMasterServices = $wmfAllServices[$wmfMasterDatacenter];
 

-- 
To view, visit https://gerrit.wikimedia.org/r/351550
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I795cbd60ef3dc5c5bd5ec961f7674be2d2db7826
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Tim Starling 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits