Fixed puppet client restart error from puppetmaster bootstrap script.

This commit is contained in:
Timo Mkinen 2011-04-20 10:38:22 +03:00
parent 861dd095ee
commit d266a6c760
2 changed files with 8 additions and 4 deletions

View file

@ -27,8 +27,11 @@ if [ $? -eq 0 ]; then
echo "\$homename = '`hostname -f`'"
echo "\$puppet_ssldir = '${ssldir}'"
echo "include puppet::server::apache"
echo "include puppet::manual"
) | puppet --no-report
else
echo "include puppet::server::apache" | \
puppet apply --no-report --manifest /dev/stdin /dev/null
(
echo "include puppet::server::apache"
echo "include puppet::manual"
) | puppet apply --no-report --manifest /dev/stdin /dev/null
fi

View file

@ -114,8 +114,9 @@ class puppet::client {
class puppet::manual inherits puppet::client {
Service["puppet"] {
ensure => undef,
enable => false,
ensure => undef,
enable => false,
subscribe => undef,
}
Cron["puppet-check"] {