summaryrefslogtreecommitdiffstats
path: root/bin/puppetmasterd
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-10-09 10:54:21 -0500
committerLuke Kanies <luke@madstop.com>2007-10-09 10:54:21 -0500
commit32753e11d9cd731760ec8ba3c4f1ad2e3402535e (patch)
tree0b6375bdefa041a7d4fbab9745ed084fb025bc30 /bin/puppetmasterd
parentafa1dee5eb3a8b5249715e61f9894b04ab34a6ae (diff)
parent01f132d8b88467dfd314ad355f1cdf9f546945b3 (diff)
downloadpuppet-32753e11d9cd731760ec8ba3c4f1ad2e3402535e.tar.gz
puppet-32753e11d9cd731760ec8ba3c4f1ad2e3402535e.tar.xz
puppet-32753e11d9cd731760ec8ba3c4f1ad2e3402535e.zip
Merge branch 'master' of git://michaelobrien.info/puppet into michael
Diffstat (limited to 'bin/puppetmasterd')
-rwxr-xr-xbin/puppetmasterd3
1 files changed, 3 insertions, 0 deletions
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 = {