summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-12-10 21:13:48 -0600
committerLuke Kanies <luke@madstop.com>2007-12-10 21:13:48 -0600
commitf127d04934b679b3e5edd7f55d31342abce3c96e (patch)
treebb8bc15e086b473bc27104cd6fcbbf548a68678e /bin
parent7a4ae082c216d68092f140ed1f5cca40ffb1a09e (diff)
Fixing #951 -- external nodes work again, but you have to
set the 'node_terminus' setting to 'exec'.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/puppet8
1 files changed, 2 insertions, 6 deletions
diff --git a/bin/puppet b/bin/puppet
index 140976ffd..409c23259 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -172,12 +172,11 @@ else
end
# Collect our facts.
-Puppet::Node::Facts.terminus_class = :facter
facts = Puppet::Node::Facts.find("me")
facts.name = facts.values["hostname"]
-# Create our Node
-node = Puppet::Node.new(facts.name)
+# Find our Node
+node = Puppet::Node.find_by_any_name(facts.name)
# Merge in the facts.
node.merge(facts.values)
@@ -195,9 +194,6 @@ if options[:loadclasses]
end
end
-# Compile and apply the configuration
-Puppet::Node::Configuration.terminus_class = :compiler
-
begin
# Compile our configuration
config = Puppet::Node::Configuration.find(node)