| Age | Commit message (Collapse) | Author |
|---|
|
Conflicts:
files/master/config.ru
files/master/puppet.conf
manifests/base.pp
manifests/centos.pp
manifests/cron.pp
manifests/cron/base.pp
manifests/cron/linux.pp
manifests/debian.pp
manifests/init.pp
manifests/linux.pp
manifests/master/linux.pp
manifests/master/package/debian.pp
manifests/puppetmaster/base.pp
manifests/puppetmaster/centos.pp
manifests/puppetmaster/checklastrun.pp
manifests/puppetmaster/checklastrun/disable.pp
manifests/puppetmaster/cleanup_reports.pp
manifests/puppetmaster/cleanup_reports/disable.pp
manifests/puppetmaster/debian.pp
manifests/puppetmaster/package.pp
manifests/puppetmaster/package/base.pp
manifests/puppetmaster/passenger.pp
|
|
|
|
|
|
|
|
|
|
|
|
This simplifies the hierarchy and fixes the problem that going from
puppet::cron to puppet under debian doesn't remove the cron file.
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
|
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
|
|
|
|
|
on each run:
notice: /Stage[main]/Puppet::Base/Service[puppet]/ensure: ensure changed 'stopped' to 'running'
When running in cron mode, you do not want the puppet service enabled, nor do
you want it 'running'. When enabling the cron mode, the first part of
puppet::cron::base does a Service override on the puppet service to set enable
=> false. That is a good thing, but all it does is make the service setup so it
wont be run on boot.
Unfortunately, the puppet service definition also has a 'ensure => running'
which does an /etc/init.d/puppet status and then starts the service if it is not
running. In a cron-only setup, the 'status' command results in a failure,
because the daemon is not running, and then puppet attempts to start it, which
goes nowhere because the /etc/default/puppet is configured not to start.
So, looking further at puppet::cron::base we see there is a case switch, testing
on operatingsystem and if its debian/ubuntu (or openbsd) it falls out of the
case. If it is not one of those, it continues and does a test to see if the
version of puppet is 2.6 and if so then it does an additional puppet Service
override to set ensure=> stopped which keeps the service from being checked to
see if it is running, and if it is not starting it.
So to fix this, we remove debian/ubuntu from the case, so it will continue
through and then we change the $puppet_majorversion test to look for anything
greater than or equal to '2.6', since 2.7 and later are also versions we want
this to work with.
After this change, we no longer get the attempt to restart puppet on every run.
|
|
|
|
|
|
|
|
|
|
puppet::cron.
The module should make sure that the cron file is not there if you aren't using
the cron method, otherwise the daemon and the cronjob could both run.
Used suggested change from jcharaoui in #3513
|
|
way it is"
This reverts commit d38e7cf64902ff55138e5f85cc7c3b880ea5fb74.
Current puppet package in Squeeze does not start by default => no need to
special case it.
|
|
The puppet::cron::freebsd class is almost identical to the
puppet::cron::openbsd one, but there is no cron job to remove, and the
/etc/rc.conf mechanism doesn't exist yet for FreeBSD.
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
|
Mar 29 14:08:23 puppetmaster puppet-master[26637]: Unrecognised escape sequence '\%' in file /etc/puppet/modules/puppet/manifests/cron/linux.pp at line 17
|
|
|
|
|
|
https://labs.riseup.net/code/issues/2819
|
|
(^err:|^alert:|^emerg:|^crit:) in the output from the puppet run doesn't leave us with a '1' return code from grep.
On Debian Squeeze systems, this problem would result in cron reporting that the cron command failed with an exit status 1:
/USR/SBIN/CRON[24107]: (CRON) error (grandchild #24108 failed with exit status 1)
This was because grep returns a '1' if it fails to find a match. We don't want the failure to find failure messages to produce a failure, so this checks the return code of the grep and fixes it to be '0' if there were no such failure log messages.
This is a bit ugly, if you ask me. We are already, unfortunately, swallowing the puppetd return code with the grep. It seems like these sorts of log messages should be retrieved via reports, logcheck, or something other than this grep of the output of the cronjob.
|
|
done to set a flag so that squeeze has the service stopped, but lenny does not
|
|
have been a mistake in a merge commit
This reverts commit bb8ede5cfa0bdbdcc0244a590e6453f16d815cb6.
|
|
/etc/cron.d/puppetd.cron file resource and move the override from manifests/debian.pp.
/etc/cron.d/puppetd.cron is not a valid cronjob according to the run-parts system that Debian uses to decide what is valid, as a result if you were to 'include puppet::cron' in your manifests on a debian/debian-derived system, then a cronjob would be created that would never be executed.
|
|
Conflicts:
manifests/cron/base.pp
manifests/debian.pp
|
|
believe that this Closes #2353)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* don't use builtin splay, splay runs depending on the fqdn of a
host -> puppet isn't running until it really should
* fix various things for cron on openbsd
|
|
this is a bit hacky, but works.
|
|
Only code style and whitespace formatting issues. Everything should
no be in ligne.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- don't use the status of the service script
- try to kill puppet _after_ we managed the service
|
|
|
|
|
|
|
|
|
