diff options
| author | Markus Roberts <Markus@reality.com> | 2011-02-01 17:57:06 -0800 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2011-02-01 17:57:06 -0800 |
| commit | 2a94c61e6c94b1167ea7b858dc184f9f77a7bfc5 (patch) | |
| tree | e8055300f7d3ac1d3b3a04aed1fab18dbba8789e /lib/puppet/util/command_line/puppetd | |
| parent | 07edcf716b2f90fb830053b207fe5dc7efcff1f3 (diff) | |
| parent | ed1359902d14a0ca89dac5debee756209b0bd433 (diff) | |
Merge branch '2.6.next' of git://github.com/puppetlabs/puppet into 2.6.next
Diffstat (limited to 'lib/puppet/util/command_line/puppetd')
| -rwxr-xr-x | lib/puppet/util/command_line/puppetd | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/puppet/util/command_line/puppetd b/lib/puppet/util/command_line/puppetd index 7d78ce90f..71b28429b 100755 --- a/lib/puppet/util/command_line/puppetd +++ b/lib/puppet/util/command_line/puppetd @@ -11,7 +11,7 @@ # # puppet agent [-D|--daemonize|--no-daemonize] [-d|--debug] # [--detailed-exitcodes] [--disable] [--enable] -# [-h|--help] [--fqdn <host name>] [-l|--logdest syslog|<file>|console] +# [-h|--help] [--certname <host name>] [-l|--logdest syslog|<file>|console] # [-o|--onetime] [--serve <handler>] [-t|--test] [--noop] # [--digest <digest>] [--fingerprint] [-V|--version] # [-v|--verbose] [-w|--waitforcert <seconds>] @@ -113,10 +113,11 @@ # # +puppet agent+ exits after executing this. # -# fqdn:: -# Set the fully-qualified domain name of the client. This is only used for -# certificate purposes, but can be used to override the discovered hostname. -# If you need to use this flag, it is generally an indication of a setup problem. +# certname:: +# Set the certname (unique ID) of the client. The master reads this unique +# identifying string, which is usually set to the node's fully-qualified domain +# name, to determine which configurations the node will receive. Use this option +# to debug setup problems or implement unusual node identification schemes. # # help:: # Print this help message |