diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2011-02-01 16:21:55 -0800 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2011-02-01 16:21:55 -0800 |
| commit | f34141477244564f31edde503a19b9fb898d986f (patch) | |
| tree | 09e501f48355c66dfd056db284549231a4cf7aa6 /lib/puppet/util/command_line | |
| parent | 443eba9b7a85cffa6b8513a32a620c80917be768 (diff) | |
| parent | e58f5dc724c060d08e0ec4abdab6908442bcc0bc (diff) | |
| download | puppet-f34141477244564f31edde503a19b9fb898d986f.tar.gz puppet-f34141477244564f31edde503a19b9fb898d986f.tar.xz puppet-f34141477244564f31edde503a19b9fb898d986f.zip | |
Merge remote branch 'james/tickets/2.6.x/5742' into 2.6.next
Diffstat (limited to 'lib/puppet/util/command_line')
| -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 |