Dzahn has submitted this change and it was merged.
Change subject: requesttracker: use test db if on jessie
......................................................................
requesttracker: use test db if on jessie
If on jessie, use the test db server to test
upgrading without touching current prod server.
Also, include standard in test role to avoid icinga config issue.
Bug:T119112
Change-Id: I8fc4f873e6bd3ab1364e9925ee3dfa88a8dfa491
---
M modules/role/manifests/requesttracker/server.pp
M modules/role/manifests/requesttracker/upgradetest.pp
2 files changed, 8 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/role/manifests/requesttracker/server.pp
b/modules/role/manifests/requesttracker/server.pp
index e2f01b8..bf3df2a 100644
--- a/modules/role/manifests/requesttracker/server.pp
+++ b/modules/role/manifests/requesttracker/server.pp
@@ -26,9 +26,15 @@
}
}
+ 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 => 'm1-master.eqiad.wmnet',
+ dbhost => $rt_dbhost,
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 073acaa..d2c8923 100644
--- a/modules/role/manifests/requesttracker/upgradetest.pp
+++ b/modules/role/manifests/requesttracker/upgradetest.pp
@@ -2,6 +2,7 @@
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/289735
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8fc4f873e6bd3ab1364e9925ee3dfa88a8dfa491
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
