Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: Add and apply twemproxy::decom
......................................................................
Add and apply twemproxy::decom
Doing it in a separate class while keeping the existing module in tact allows
us to reverse-course easily if the migration goes south.
Change-Id: I5175f6afe478fc4a5cfeca65d216de235a4811b9
---
M manifests/misc/deployment.pp
D modules/mediawiki/files/twemproxy.default
M modules/mediawiki/manifests/init.pp
M modules/mediawiki/manifests/users.pp
A modules/twemproxy/manifests/decom.pp
5 files changed, 27 insertions(+), 11 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index 5bfd113..1c7f61d 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -150,8 +150,7 @@
ensure => link,
target => '/srv/deployment/scap/scap/bin/mw-update-l10n';
'/usr/local/bin/restart-twemproxy':
- ensure => link,
- target => '/srv/deployment/scap/scap/bin/restart-twemproxy';
+ ensure => absent;
'/usr/local/bin/restart-nutcracker':
ensure => link,
target => '/srv/deployment/scap/scap/bin/restart-nutcracker';
diff --git a/modules/mediawiki/files/twemproxy.default
b/modules/mediawiki/files/twemproxy.default
deleted file mode 100644
index 2aa8166..0000000
--- a/modules/mediawiki/files/twemproxy.default
+++ /dev/null
@@ -1,4 +0,0 @@
-# Configuration file for twemproxy
-MW_COMMON=`bash -c 'source /usr/local/lib/mw-deployment-vars.sh && echo
$MW_COMMON'`
-. $MW_COMMON/multiversion/MWRealm.sh
-CONFIG=`getRealmSpecificFilename "$MW_COMMON/wmf-config/twemproxy.yaml"`
diff --git a/modules/mediawiki/manifests/init.pp
b/modules/mediawiki/manifests/init.pp
index 47c28b8..498564e 100644
--- a/modules/mediawiki/manifests/init.pp
+++ b/modules/mediawiki/manifests/init.pp
@@ -11,9 +11,7 @@
content => $::site,
}
- class { '::twemproxy':
- default_file => 'puppet:///modules/mediawiki/twemproxy.default',
- }
+ include ::twemproxy::decom
if $::realm == 'labs' {
$mw_mc_server_list = [
diff --git a/modules/mediawiki/manifests/users.pp
b/modules/mediawiki/manifests/users.pp
index a9ac719..a7c258d 100644
--- a/modules/mediawiki/manifests/users.pp
+++ b/modules/mediawiki/manifests/users.pp
@@ -77,9 +77,7 @@
sudo_group { 'wikidev':
privileges => [
'ALL = (apache,mwdeploy,l10nupdate) NOPASSWD: ALL',
- 'ALL = (root) NOPASSWD: /sbin/restart twemproxy',
'ALL = (root) NOPASSWD: /sbin/restart nutcracker',
- 'ALL = (root) NOPASSWD: /sbin/start twemproxy',
'ALL = (root) NOPASSWD: /sbin/start nutcracker',
'ALL = NOPASSWD: /usr/sbin/apache2ctl',
'ALL = NOPASSWD: /etc/init.d/apache2',
diff --git a/modules/twemproxy/manifests/decom.pp
b/modules/twemproxy/manifests/decom.pp
new file mode 100644
index 0000000..330ec7e
--- /dev/null
+++ b/modules/twemproxy/manifests/decom.pp
@@ -0,0 +1,25 @@
+# == Class: twemproxy::decom
+#
+# Decommission twemproxy.
+#
+class twemproxy::decom {
+ service { 'twemproxy':
+ ensure => stopped,
+ provider => upstart,
+ before => File['/etc/init/twemproxy.conf'],
+ }
+
+ file { '/etc/init/twemproxy.conf':
+ ensure => absent,
+ before => File['/etc/default/twemproxy'],
+ }
+
+ file { '/etc/default/twemproxy':
+ ensure => absent,
+ before => Package['twemproxy'],
+ }
+
+ package { 'twemproxy':
+ ensure => absent,
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/144350
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5175f6afe478fc4a5cfeca65d216de235a4811b9
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
