Ori.livneh has submitted this change and it was merged.
Change subject: decom /etc/cluster file on app servers
......................................................................
decom /etc/cluster file on app servers
It's only used by apache-graceful-all to determine whether to log the action or
not, which makes no sense at all.
Change-Id: Ib45125f15ebc2276b4c1ab707a349268ea772965
---
M modules/apachesync/files/apache-graceful-all
M modules/mediawiki/manifests/init.pp
2 files changed, 2 insertions(+), 15 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/apachesync/files/apache-graceful-all
b/modules/apachesync/files/apache-graceful-all
index 9ac4a23..4dc192a 100755
--- a/modules/apachesync/files/apache-graceful-all
+++ b/modules/apachesync/files/apache-graceful-all
@@ -1,10 +1,4 @@
#!/bin/bash
-if [ `cat /etc/cluster` == eqiad ]; then
- /usr/local/bin/dologmsg "$USER is doing a graceful restart of all
apaches"
-fi
-
+/usr/local/bin/dologmsg "$USER is doing a graceful restart of all apaches"
dsh -F20 -g apaches -cM 'sudo /usr/sbin/apache2ctl graceful'
-
-if [ `cat /etc/cluster` == eqiad ]; then
- /usr/local/bin/dologmsg "!log $USER gracefulled all apaches"
-fi
+/usr/local/bin/dologmsg "!log $USER gracefulled all apaches"
diff --git a/modules/mediawiki/manifests/init.pp
b/modules/mediawiki/manifests/init.pp
index ec1b024..bab64bc 100644
--- a/modules/mediawiki/manifests/init.pp
+++ b/modules/mediawiki/manifests/init.pp
@@ -12,13 +12,6 @@
include ::mediawiki::hhvm
}
- file { '/etc/cluster':
- content => $::site,
- owner => 'root',
- group => 'root',
- mode => '0444',
- }
-
# Increase scheduling priority of SSHD
file { '/etc/init/ssh.override':
content => "nice -10\n",
--
To view, visit https://gerrit.wikimedia.org/r/160056
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib45125f15ebc2276b4c1ab707a349268ea772965
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
