diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2011-06-08 13:53:21 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2011-06-08 13:53:21 -0700 |
| commit | 98f58ceff86547753bfb625ef6c222fbbf70ce28 (patch) | |
| tree | 5de347c15a657001e34f9a5a3d805b66c0b46dbd /lib | |
| parent | 1cd848c5e28835f96f66b9d0e17b353dc02a60e3 (diff) | |
| download | puppet-98f58ceff86547753bfb625ef6c222fbbf70ce28.tar.gz puppet-98f58ceff86547753bfb625ef6c222fbbf70ce28.tar.xz puppet-98f58ceff86547753bfb625ef6c222fbbf70ce28.zip | |
(#2128) Add WARNING for node_name_{fact,value} descriptions
Minor change to add a WARNING string as per feedback from UX.
Reviewed-by: Randall Hansen <randall@puppetlabs.com>
Diffstat (limited to 'lib')
| -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] |