Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/292387
Change subject: Revert "requesttracker: use test db if on jessie"
......................................................................
Revert "requesttracker: use test db if on jessie"
This reverts commit b17794bdb5b7a63aac9b26434eb118211d80ccd3.
Change-Id: I7e92d0aeba83d4c58c24eaedbdbe2b4376cc727b
---
M modules/role/manifests/requesttracker/server.pp
M modules/role/manifests/requesttracker/upgradetest.pp
2 files changed, 1 insertion(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/87/292387/1
diff --git a/modules/role/manifests/requesttracker/server.pp
b/modules/role/manifests/requesttracker/server.pp
index bf3df2a..e2f01b8 100644
--- a/modules/role/manifests/requesttracker/server.pp
+++ b/modules/role/manifests/requesttracker/server.pp
@@ -26,15 +26,9 @@
}
}
- if os_version('debian >= jessie') {
- $rt_dbhost = 'db2007.codfw.wmnet'
- } else {
- $rt_dbhost = 'm1-master.eqiad.wmnet'
- }
-
class { '::requesttracker':
apache_site => 'rt.wikimedia.org',
- dbhost => $rt_dbhost,
+ dbhost => 'm1-master.eqiad.wmnet',
dbport => '',
dbuser => $passwords::misc::rt::rt_mysql_user,
dbpass => $passwords::misc::rt::rt_mysql_pass,
diff --git a/modules/role/manifests/requesttracker/upgradetest.pp
b/modules/role/manifests/requesttracker/upgradetest.pp
index d2c8923..073acaa 100644
--- a/modules/role/manifests/requesttracker/upgradetest.pp
+++ b/modules/role/manifests/requesttracker/upgradetest.pp
@@ -2,7 +2,6 @@
class role::requesttracker::upgradetest {
system::role { 'role::requesttracker::upgradetest': description => 'temp
test setup for RT migration to jessie' }
- include standard
include base::firewall
include rsync::server
--
To view, visit https://gerrit.wikimedia.org/r/292387
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e92d0aeba83d4c58c24eaedbdbe2b4376cc727b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
