Muehlenhoff has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378925 )
Change subject: Remove deployment::redis
......................................................................
Remove deployment::redis
This was only needed by Trebuchet and can now be removed.
Change-Id: I7990791abb256865a529ee1192cbc8ce709597f5
---
D modules/deployment/manifests/redis.pp
M modules/profile/manifests/mediawiki/deployment/server.pp
2 files changed, 0 insertions(+), 35 deletions(-)
Approvals:
Thcipriani: Looks good to me, but someone else must approve
Muehlenhoff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/deployment/manifests/redis.pp
b/modules/deployment/manifests/redis.pp
deleted file mode 100644
index 9b1ccbc..0000000
--- a/modules/deployment/manifests/redis.pp
+++ /dev/null
@@ -1,31 +0,0 @@
-# == Class deployment::redis
-# Simple wrapper to enable replication between trebuchet masters
-
-class deployment::redis($deployment_server) {
-
- if $::initsystem == 'upstart' {
- $daemonize_redis = false
- } else {
- $daemonize_redis = true
- }
-
- if ($::fqdn != $deployment_server) {
- $deployment_ipv4 = ipresolve($deployment_server, 4)
- # Just a read-only slave for now
- redis::instance { '6379':
- settings => {
- daemonize => $daemonize_redis,
- slave_read_only => true,
- slaveof => "${deployment_ipv4} 6379",
- bind => '0.0.0.0',
- },
- }
- } else {
- redis::instance { '6379':
- settings => {
- daemonize => $daemonize_redis,
- bind => '0.0.0.0',
- },
- }
- }
-}
diff --git a/modules/profile/manifests/mediawiki/deployment/server.pp
b/modules/profile/manifests/mediawiki/deployment/server.pp
index 3479e77..a869d36 100644
--- a/modules/profile/manifests/mediawiki/deployment/server.pp
+++ b/modules/profile/manifests/mediawiki/deployment/server.pp
@@ -88,10 +88,6 @@
require => File['/srv/deployment'],
}
- class { '::deployment::redis':
- deployment_server => $deployment_server
- }
-
$deploy_ensure = $deployment_server ? {
$::fqdn => 'absent',
default => 'present'
--
To view, visit https://gerrit.wikimedia.org/r/378925
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7990791abb256865a529ee1192cbc8ce709597f5
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Thcipriani <tcipri...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
