diff options
author | Luke Kanies <luke@madstop.com> | 2009-01-19 16:29:17 -0600 |
---|---|---|
committer | Luke Kanies <luke@madstop.com> | 2009-02-06 18:08:39 -0600 |
commit | 8f5cbc349daa868020b009851ee97ea3f29fcfbf (patch) | |
tree | 5cfc7826cb90d7daf8aa1014b83ee1877255ebee /bin | |
parent | 25b28c58c22bae718794dc679f10c61665af0b15 (diff) | |
download | puppet-8f5cbc349daa868020b009851ee97ea3f29fcfbf.tar.gz puppet-8f5cbc349daa868020b009851ee97ea3f29fcfbf.tar.xz puppet-8f5cbc349daa868020b009851ee97ea3f29fcfbf.zip |
This is work that I've decided not to keep
so I'm just applying it here so it continues to show
up in the history in case I ever want to look at it again.
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/puppetd | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/bin/puppetd b/bin/puppetd index ecea2d894..cc60d8cdc 100755 --- a/bin/puppetd +++ b/bin/puppetd @@ -328,20 +328,23 @@ end Puppet::SSL::Host.ca_location = :remote Puppet::Transaction::Report.terminus_class = :rest +Puppet::Node::Facts.terminus_class = :facter +Puppet::Node::Facts.cache_class = :rest -# We need tomake the client either way, we just don't start it -# if --no-client is set. -client = Puppet::Network::Client.master.new(args) if options[:enable] - client.enable + Puppet::Agent.enable elsif options[:disable] - client.disable + Puppet::Agent.disable end if options[:enable] or options[:disable] exit(0) end +# We need tomake the client either way, we just don't start it +# if --no-client is set. +client = Puppet::Network::Client.master.new(args) + server = nil # It'd be nice to daemonize later, but we have to daemonize before the |