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