summaryrefslogtreecommitdiffstats
path: root/lib/puppet/application
diff options
context:
space:
mode:
authorNick Lewis <nick@puppetlabs.com>2011-06-02 16:16:12 -0700
committerNick Lewis <nick@puppetlabs.com>2011-06-06 15:48:58 -0700
commitcd4fe148aae923f1167a3db450b64ead87418018 (patch)
tree84f24295a1767b6bad7daceae012147152186902 /lib/puppet/application
parenta00fd25547db6dec8fcd57a004fbec58324ce3dc (diff)
downloadpuppet-cd4fe148aae923f1167a3db450b64ead87418018.tar.gz
puppet-cd4fe148aae923f1167a3db450b64ead87418018.tar.xz
puppet-cd4fe148aae923f1167a3db450b64ead87418018.zip
(#2128) Add the ability to specify a node name
The setting node_name_value may now be used for 'puppet apply' or 'puppet agent' to specify the name for the node. This will not affect the certificate used by the node, and the node will still be authenticated based on its certname. The default value for node_name_value is the certname. This is useful for eg. EC2 nodes whose random hostnames cannot be easily used to classify them. Paired-With: Jacob Helwig
Diffstat (limited to 'lib/puppet/application')
-rw-r--r--lib/puppet/application/apply.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/puppet/application/apply.rb b/lib/puppet/application/apply.rb
index 7f0b95a89..3f423a4c4 100644
--- a/lib/puppet/application/apply.rb
+++ b/lib/puppet/application/apply.rb
@@ -85,13 +85,13 @@ class Puppet::Application::Apply < Puppet::Application
end
# Collect our facts.
- unless facts = Puppet::Node::Facts.find(Puppet[:certname])
- raise "Could not find facts for #{Puppet[:certname]}"
+ unless facts = Puppet::Node::Facts.find(Puppet[:node_name_value])
+ raise "Could not find facts for #{Puppet[:node_name_value]}"
end
# Find our Node
- unless node = Puppet::Node.find(Puppet[:certname])
- raise "Could not find node #{Puppet[:certname]}"
+ unless node = Puppet::Node.find(Puppet[:node_name_value])
+ raise "Could not find node #{Puppet[:node_name_value]}"
end
# Merge in the facts.