jenkins-bot has submitted this change and it was merged.
Change subject: Update MWRealm to drop pmtpa
......................................................................
Update MWRealm to drop pmtpa
Change-Id: Ib4e8a64fd97eb2e4557d267bd7d5dfdbe3a22df6
---
M multiversion/MWRealm.php
M multiversion/MWRealm.sh
2 files changed, 5 insertions(+), 7 deletions(-)
Approvals:
Reedy: Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/multiversion/MWRealm.php b/multiversion/MWRealm.php
index 90c5b4b..58946bc 100644
--- a/multiversion/MWRealm.php
+++ b/multiversion/MWRealm.php
@@ -4,8 +4,7 @@
# location. Thet should be provisioned by puppet in /etc/wikimedia-site and
# /etc/wikimedia-realm.
#
-# The possible values of $wmfRealm and $wmfDatacenter as of February 2014 are:
-# - labs + pmtpa
+# The possible values of $wmfRealm and $wmfDatacenter as of April 2014 are:
# - labs + eqiad
# - production + eqiad
global $wmfDatacenter, $wmfRealm;
@@ -24,7 +23,7 @@
switch( $wmfRealm ) {
case 'labs':
case 'production':
- if ( ! in_array( $wmfDatacenter, array( 'pmtpa', 'eqiad' ) ) ) {
+ if ( ! in_array( $wmfDatacenter, array( 'eqiad' ) ) ) {
$wmfDatacenter = 'eqiad';
}
break;
@@ -41,7 +40,6 @@
function listAllRealmsAndDatacenters() {
return array(
array( 'production', 'eqiad' ),
- array( 'labs', 'pmtpa' ),
array( 'labs', 'eqiad' ),
);
}
diff --git a/multiversion/MWRealm.sh b/multiversion/MWRealm.sh
index 308bfbe..7f8ca13 100644
--- a/multiversion/MWRealm.sh
+++ b/multiversion/MWRealm.sh
@@ -16,10 +16,10 @@
case "$WMF_REALM" in
"production"|"labs")
case "$WMF_DATACENTER" in
- "pmtpa"|"eqiad")
+ "eqiad")
;;
*)
- WMF_DATACENTER=pmtpa
+ WMF_DATACENTER=eqiad
;;
esac
;;
@@ -27,7 +27,7 @@
*)
# Assume something vaguely resembling a default
WMF_REALM=production
- WMF_DATACENTER=pmtpa
+ WMF_DATACENTER=eqiad
;;
esac
--
To view, visit https://gerrit.wikimedia.org/r/129642
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4e8a64fd97eb2e4557d267bd7d5dfdbe3a22df6
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
