| Age | Commit message (Collapse) | Author |
|---|
|
The preferences snippet requires that we set the package parameter to 'puppet*' to pull in the correct dependencies.
We set the priority to 2000 because according to apt_preferences(5):
P > 1000 causes a version to be installed even if this constitutes a downgrade of the package
which is the desired behavior.
This should resolve issue #2928
|
|
|
|
|
|
Conflicts:
manifests/cron.pp
manifests/puppetmaster/package/debian.pp
|
|
|
|
|
|
|
|
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
|
|
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
|
|
The two package providers for FreeBSD are not able to ensure that a
specific version of a package is installed because of how ports/pkg_add
work. They can only ensure the version from the specified FreeBSD
release is installed or absent.
For more information, see:
http://docs.puppetlabs.com/references/stable/type.html#features-4
To make the class easier to understand, let's not do something that
users don't expect when they're requesting installation of a specific
version. We'll explicitly fail and tell users why so that they can
adjust how they use the class/module.
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
|
$puppetmaster_ensure_version is not set
|
|
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>
|
|
We'd like to use this variable in the 'puppet' class since we're
defining the path to another config file, there.
Since puppet::puppetmaster inherits the puppet class, the variable will
be defined appropriately. Just to make sure we get the value from the
right place, let's also use the qualified variable name.
To avoid useless repetitions in the variable name, change the variable
name from $puppet_default_config_dir to $default_config_dir.
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
|
The FreeBSD class was previously defined but not included by the puppet
class in init.pp
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
|
The linux class installs puppet and facter via puppet itself.
Chances are that they are already installed, since you need puppet
before you can run puppet.
_But_, it enables the $puppet_ensure_version and $facter_ensure_version
features (forcing the installed version). So let's do the same in
FreeBSD.
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
|
The puppet master has one additional config file that needs to be placed
in a different folder under FreeBSD.
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
|
Some pieces of the puzzle are missing for being able to manage puppet in
FreeBSD.
* Add a default puppet client config template for FreeBSD
* In FreeBSD, puppet.conf is not in /etc/puppet/ so let's provide a
value for this variable in init.pp.
* The rc script for starting and stopping puppet is not located in
/etc/rc.d so let's signify this to Service[puppet]
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
|
|
|
|
|
much more configurable"
This reverts commit 0f4718f062f7419092f69dcdd951339a466a79b8.
Unfortuantely due to puppet bug #5517 we currently can't do it that
nice so we need to hack around things
https://projects.puppetlabs.com/issues/5517
|
|
This reverts commit 0fd0df89f4a0bd0700b3260a4c40041c59f65660.
|
|
|
|
configurable
|
|
undefined variables
|
|
|
|
This should fix the remaining issues from
https://labs.riseup.net/code/issues/2928
|
|
|
|
version through puppetmaster_ensure_version (such as through backports)
|
|
removed for public use or incorporated into the puppet module"
This isn't something we want to keep
This reverts commit bc4fa29b454691b6c446b2881b4b3ea39d6b8272.
|
|
|
|
|
|
|
|
public use or incorporated into the puppet module
|
|
|
|
package diferences.
|
|
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
|
|
|
|
|
|
|
|
pulling 2 bytes from /dev/urandom, giving them to od which turns them into unsigned decimals, and then we bitshift the output, either by 5 or 6 depending on if we are replacing $RANDOM/1000*60 (right sift by 5 is the same as dividing by 2^N, or /32) or $RANDOM/2000*60 (range of [0,983])
Thanks to dkg for working through this with me, not only did he come up with it faster than a human brain should be able to function, he had the patience to explain all the individual pieces that I did not understand to me.
|
|
(^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
|
|
$puppet_ensure_version to a backported version and your pinning was setup so
that you dont pull any packages unless explicit (I believe this is the default),
then you will end up seeing things like this:
The following packages have unmet dependencies:
puppet: Depends: puppet-common (= 2.6.2-4~bpo50+1) but 2.6.2-1~bpo50+1 is to be installed
E: Broken packages
at /etc/puppet/modules/puppet/manifests/linux.pp:6
this commit adds the $puppet_ensure_version test in debian.pp to make sure that
the puppet-common package is also following this request
|
|
|
|
have been a mistake in a merge commit
This reverts commit bb8ede5cfa0bdbdcc0244a590e6453f16d815cb6.
|
|
distinguish between different linux distros
|
