tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed puppet client restart error from puppetmaster bootstrap script.

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

7
puppet/bootstrap-server.sh
View file

@ -27,8 +27,11 @@ if [ $? -eq 0 ]; then
echo "\$homename = '`hostname -f`'" echo "\$homename = '`hostname -f`'"
echo "\$puppet_ssldir = '${ssldir}'" echo "\$puppet_ssldir = '${ssldir}'"
echo "include puppet::server::apache" echo "include puppet::server::apache"
echo "include puppet::manual"
) | puppet --no-report ) | puppet --no-report
else 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 fi

5
puppet/manifests/init.pp
View file

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