summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2008-10-03 11:20:23 +1000
committerJames Turnbull <james@lovedthanlost.net>2008-10-03 13:45:12 +1000
commit397c8416f78c7a1d081f673dcfe2d70e2d7cee16 (patch)
treedf0c07119c6db652c54453e16cce377007db0884 /bin
parent9d174c4f50b7281ac0bbba29d5c496c6028e469c (diff)
downloadpuppet-397c8416f78c7a1d081f673dcfe2d70e2d7cee16.tar.gz
puppet-397c8416f78c7a1d081f673dcfe2d70e2d7cee16.tar.xz
puppet-397c8416f78c7a1d081f673dcfe2d70e2d7cee16.zip
Fixed #1628 - Changed node search to use certname rather than Facter hostname
Diffstat (limited to 'bin')
-rwxr-xr-xbin/puppet7
1 files changed, 4 insertions, 3 deletions
diff --git a/bin/puppet b/bin/puppet
index 142ddd9bb..942902586 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -183,11 +183,12 @@ if Puppet[:parseonly]
end
# Collect our facts.
-facts = Puppet::Node::Facts.find("me")
-facts.name = facts.values["hostname"]
+facts = Puppet::Node::Facts.find(Puppet[:certname])
# Find our Node
-node = Puppet::Node.find(facts.name)
+unless node = Puppet::Node.find(Puppet[:certname])
+ raise "Could not find node %s" % Puppet[:certname]
+end
# Merge in the facts.
node.merge(facts.values)