[MediaWiki-commits] [Gerrit] beta: syslog-ng on deployment-bastion host - change (operations/puppet)

2013-07-26 Thread Lcarr (Code Review) 
Lcarr has submitted this change and it was merged.

Change subject: beta: syslog-ng on deployment-bastion host
..


beta: syslog-ng on deployment-bastion host

The puppet base class installs rsyslog by default which conflicts with
the syslog-ng package which should be used for central syslog.

I have bringed that up a few months ago but the hack has been rejected,
this is now a serious blocker to advance on beta since we have NO
SYSLOG!  That prevents us from finding out what is happening in some
part of the cluster and one as to rely on using tcpdump + some scripting
to parse out the output. Definitely annoying.

Change-Id: Ia9e13c1104a29a9193b43404c49655d812c0b7db
---
M manifests/base.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Lcarr: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/base.pp b/manifests/base.pp
index c2e5324..16d1078 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -239,7 +239,7 @@
 }
 
 class base::remote-syslog {
-   if ($::lsbdistid == Ubuntu) and ($::hostname != nfs1) and 
($::hostname != nfs2) {
+   if ($::lsbdistid == Ubuntu) and ($::hostname != nfs1) and 
($::hostname != nfs2) and ($::instancename != 'deployment-bastion') {
package { rsyslog:
ensure = latest;
}

-- 
To view, visit https://gerrit.wikimedia.org/r/51668
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9e13c1104a29a9193b43404c49655d812c0b7db
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Lcarr lc...@wikimedia.org
Gerrit-Reviewer: Pyoungmeister p...@wikimedia.org
Gerrit-Reviewer: Ryan Lane rl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] beta: syslog-ng on deployment-bastion host - change (operations/puppet)

2013-03-01 Thread Hashar (Code Review) 
Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/51668


Change subject: beta: syslog-ng on deployment-bastion host
..

beta: syslog-ng on deployment-bastion host

The puppet base class installs rsyslog by default which conflicts with
the syslog-ng package which should be used for central syslog.

I have bringed that up a few months ago but the hack has been rejected,
this is now a serious blocker to advance on beta since we have NO
SYSLOG!  That prevents us from finding out what is happening in some
part of the cluster and one as to rely on using tcpdump + some scripting
to parse out the output. Definitely annoying.

Change-Id: Ia9e13c1104a29a9193b43404c49655d812c0b7db
---
M manifests/base.pp
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/68/51668/1

diff --git a/manifests/base.pp b/manifests/base.pp
index 9909d6e..9c08dfb 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -215,7 +215,7 @@
 }
 
 class base::remote-syslog {
-   if ($::lsbdistid == Ubuntu) and ($::hostname != nfs1) and 
($::hostname != nfs2) {
+   if ($::lsbdistid == Ubuntu) and ($::hostname != nfs1) and 
($::hostname != nfs2) and ($::instancename != 'deployment-bastion') {
package { rsyslog:
ensure = latest;
}
@@ -231,7 +231,7 @@
# Per labs project syslog:
case $::instanceproject {
'deployment-prep': {
-   $syslog_remote_real = 
'deployment-dbdump.pmtpa.wmflabs'
+   $syslog_remote_real = 
'deployment-bastion.pmtpa.wmflabs'
}
default: {
$syslog_remote_real = 
'i-03a9.pmtpa.wmflabs:5544'

-- 
To view, visit https://gerrit.wikimedia.org/r/51668
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9e13c1104a29a9193b43404c49655d812c0b7db
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits