Pyoungmeister has submitted this change and it was merged.
Change subject: Revert "run puppet by cron instead of via the agent"
......................................................................
Revert "run puppet by cron instead of via the agent"
This reverts commit 2b8f5111cfae779583a721a81f147d60edc9be57
Change-Id: Ifb992eee52bbcccf5c05a6f6ce982c1c875700e2
---
D files/logrotate/puppet
M manifests/base.pp
D templates/base/puppet.cron.erb
3 files changed, 17 insertions(+), 55 deletions(-)
Approvals:
Pyoungmeister: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/logrotate/puppet b/files/logrotate/puppet
deleted file mode 100644
index b10828c..0000000
--- a/files/logrotate/puppet
+++ /dev/null
@@ -1,12 +0,0 @@
-#####################################################################
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/logrotate/puppet
-#####################################################################
-
-/var/log/puppet {
- daily
- compress
- missingok
- notifempty
- rotate 7
-}
diff --git a/manifests/base.pp b/manifests/base.pp
index bb63b3d..9909d6e 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -97,7 +97,7 @@
}
monitor_service { "puppet freshness": description => "Puppet
freshness", check_command => "puppet-FAIL", passive => "true", freshness =>
36000, retries => 1 ; }
-
+
case $::realm {
'production': {
exec { "puppet snmp trap":
@@ -183,49 +183,27 @@
refreshonly => true;
}
- # Keep puppet running -- no longer. now via cron
+ # Keep puppet running
cron {
restartpuppet:
require => File[ [ "/etc/default/puppet" ] ],
command => "/etc/init.d/puppet restart > /dev/null",
user => root,
- # Restart every 4 hours to avoid the runs bunching up
and causing an
+ # Restart every 4 hours to avoid the runs bunching up
and causing an
# overload of the master every 40 mins. This can be
reverted back to a
# daily restart after we switch to puppet 2.7.14+ since
that version
# uses a scheduling algorithm which should be more
resistant to
# bunching.
hour => [0, 4, 8, 12, 16, 20],
minute => 37,
- ensure => absent;
+ ensure => present;
remove-old-lockfile:
require => Package[puppet],
command => "[ -f /var/lib/puppet/state/puppetdlock ] &&
find /var/lib/puppet/state/puppetdlock -ctime +1 -delete",
user => root,
minute => 43,
- ensure => absent;
- }
-
- ## do not use puppet agent
- service {"puppetd":
- enable => false,
- ensure => stopped;
- }
-
- ## run puppet by cron and
- ## rotate puppet logs generated by cron
- file {
- "/etc/cron.d/puppet":
- require => File[ [ "/etc/default/puppet" ] ],
- mode => 0444,
- owner => root,
- group => root,
- content => template("base/puppet.cron.erb");
- "/etc/logrotate.d/puppet":
- mode => 0444,
- owner => root,
- group => root,
- source => "puppet:///files/logrotate/puppet";
- }
+ ensure => present;
+ }
# Report the last puppet run in MOTD
if $::lsbdistid == "Ubuntu" and versioncmp($::lsbdistrelease, "9.10")
>= 0 {
@@ -303,7 +281,7 @@
notify => Exec["/sbin/start procps"],
source =>
"puppet:///files/misc/50-wikimedia-base.conf.sysctl"
}
-
+
# Disable IPv6 privacy extensions, we rather not see our
servers hide
file { "/etc/sysctl.d/10-ipv6-privacy.conf":
ensure => absent
@@ -329,7 +307,7 @@
if $::lsbdistid == "Ubuntu" and versioncmp($::lsbdistrelease,
"10.04") >= 0 {
package { lldpd: ensure => latest; }
}
-
+
# DEINSTALL these packages
package { [ "mlocate" ]:
ensure => absent;
@@ -441,7 +419,7 @@
}
class base::vimconfig {
- file { "/etc/vim/vimrc.local":
+ file { "/etc/vim/vimrc.local":
owner => root,
group => root,
mode => 0444,
@@ -561,7 +539,7 @@
upstart_job { "${lom_serial_port}": require =>
File["/etc/init/${lom_serial_port}.conf"] }
}
}
-
+
class generic {
class dell {
$lom_serial_port = "ttyS1"
@@ -596,7 +574,7 @@
notify => Exec["reload udev"],
tag => "thumper-udev";
}
-
+
exec { "reload udev":
command => "/sbin/udevadm control
--reload-rules",
refreshonly => true
@@ -606,14 +584,14 @@
class dell-c2100 inherits base::platform::generic::dell {
$lom_serial_speed = "115200"
-
- class { "common": lom_serial_port => $lom_serial_port,
lom_serial_speed => $lom_serial_speed }
+
+ class { "common": lom_serial_port => $lom_serial_port,
lom_serial_speed => $lom_serial_speed }
}
class dell-r300 inherits base::platform::generic::dell {
$lom_serial_speed = "57600"
-
- class { "common": lom_serial_port => $lom_serial_port,
lom_serial_speed => $lom_serial_speed }
+
+ class { "common": lom_serial_port => $lom_serial_port,
lom_serial_speed => $lom_serial_speed }
}
class sun-x4500 inherits base::platform::generic::sun {
@@ -630,7 +608,7 @@
}
class cisco-C250-M1 inherits base::platform::generic::cisco {
- class { "common": lom_serial_port => $lom_serial_port,
lom_serial_speed => $lom_serial_speed }
+ class { "common": lom_serial_port => $lom_serial_port,
lom_serial_speed => $lom_serial_speed }
}
case $::productname {
@@ -688,7 +666,7 @@
group => root,
ensure => present;
}
-
+
exec { "/etc/network/if-up.d/initcwnd":
require => File["/etc/network/if-up.d/initcwnd"],
subscribe => File["/etc/network/if-up.d/initcwnd"],
diff --git a/templates/base/puppet.cron.erb b/templates/base/puppet.cron.erb
deleted file mode 100644
index abbb564..0000000
--- a/templates/base/puppet.cron.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-## This file is managed by Puppet!
-## templates/base/puppet.cron.erb
-<% $crontime = fqdn_rand(30) %>
-<%= $crontime %>,<%= $crontime+30 %> * * * * root timeout -k 300 1800 puppet
agent --onetime --verbose --no-daemonize --no-splay --show_diff >>
/var/log/puppet.log 2>&1
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/54974
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb992eee52bbcccf5c05a6f6ce982c1c875700e2
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Pyoungmeister <[email protected]>
Gerrit-Reviewer: Pyoungmeister <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
