2 files changed, 4 insertions, 1 deletions
diff --git a/bin/puppet b/bin/puppet
index b004111c9..e4e3dd309 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -203,7 +203,7 @@ begin
     config = Puppet::Node::Configuration.find(node)
 
     # Translate it to a RAL configuration
-    config = config.extract_to_transportable.to_configuration
+    config = config.to_ral
 
     # And apply it
     config.apply
diff --git a/bin/puppetmasterd b/bin/puppetmasterd
index 39802f229..b782969a8 100755
--- a/bin/puppetmasterd
+++ b/bin/puppetmasterd
@@ -186,6 +186,9 @@ end
 Puppet.genconfig
 Puppet.genmanifest
 
+# A temporary solution, to at least make the master work for now.
+Puppet::Node::Facts.terminus_class = :yaml
+
 require 'etc'
 
 handlers = {