diff options
| -rw-r--r-- | lib/puppet/defaults.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index b6d25d6d6..82ff1095f 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -488,16 +488,16 @@ module Puppet setdefaults(:agent, :node_name_value => { :default => "$certname", :desc => "The explicit value used for the node name for all requests the agent - makes to the master. This setting is mutually exclusive with node_name_fact. - Changing this setting also requires changes to the default auth.conf - configuration on the Puppet Master. Please see + makes to the master. WARNING: This setting is mutually exclusive with + node_name_fact. Changing this setting also requires changes to the default + auth.conf configuration on the Puppet Master. Please see http://links.puppetlabs.com/node_name_value for more information." }, :node_name_fact => { :default => "", - :desc => " The fact name used to determine the node name used for all requests the agent - makes to the master. This setting is mutually exclusive with node_name_value. - Changing this setting also requires changes to the default auth.conf - configuration on the Puppet Master. Please see + :desc => "The fact name used to determine the node name used for all requests the agent + makes to the master. WARNING: This setting is mutually exclusive with + node_name_value. Changing this setting also requires changes to the default + auth.conf configuration on the Puppet Master. Please see http://links.puppetlabs.com/node_name_fact for more information.", :hook => proc do |value| if !value.empty? and Puppet[:node_name_value] != Puppet[:certname] |