diff options
| author | James Turnbull <james@lovedthanlost.net> | 2009-02-01 11:05:48 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-02-01 11:05:48 +1100 |
| commit | 140786570176f5fcd8774f83fbf0bf4087a2cc32 (patch) | |
| tree | 275b91dc3ea025bc8e35c62a0b26bcbf3d2fa19d /bin | |
| parent | 8d0086b3cb877765857b7ff0dee454b14417430a (diff) | |
| download | puppet-140786570176f5fcd8774f83fbf0bf4087a2cc32.tar.gz puppet-140786570176f5fcd8774f83fbf0bf4087a2cc32.tar.xz puppet-140786570176f5fcd8774f83fbf0bf4087a2cc32.zip | |
Revert "Fixed #1916 - Added environment option to puppetd"
This reverts commit 8d0086b3cb877765857b7ff0dee454b14417430a.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/puppetd | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/bin/puppetd b/bin/puppetd index 29b0e7249..ecea2d894 100755 --- a/bin/puppetd +++ b/bin/puppetd @@ -9,10 +9,9 @@ # = Usage # # puppetd [-D|--daemonize|--no-daemonize] [-d|--debug] [--disable] [--enable] -# [-e|--environment=<environment>] [-h|--help] [--fqdn <host name>] -# [-l|--logdest syslog|<file>|console] [-o|--onetime] -# [--serve <handler>] [-t|--test] [--noop] [-V|--version] -# [-v|--verbose] [-w|--waitforcert <seconds>] +# [-h|--help] [--fqdn <host name>] [-l|--logdest syslog|<file>|console] +# [-o|--onetime] [--serve <handler>] [-t|--test] [--noop] +# [-V|--version] [-v|--verbose] [-w|--waitforcert <seconds>] # # = Description # @@ -91,14 +90,6 @@ # # +puppetd+ exits after executing this. # -# environment:: -# Specify an environment to run. This enables you to run a different -# set of manifests, modules, templates etc. for a different -# environment than is default. For example, the default environment -# is set to 'production', and so using this option you could test -# your new development module by specifying that the 'development' -# environment should be run, like so: puppetd --test --environment=development -# # 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. @@ -179,7 +170,6 @@ options = [ [ "--disable", GetoptLong::NO_ARGUMENT ], [ "--debug", "-d", GetoptLong::NO_ARGUMENT ], [ "--enable", GetoptLong::NO_ARGUMENT ], - [ "--environment=<environment>", GetoptLong::REQUIRED_ARGUMENT ], [ "--fqdn", "-f", GetoptLong::REQUIRED_ARGUMENT ], [ "--help", "-h", GetoptLong::NO_ARGUMENT ], [ "--logdest", "-l", GetoptLong::REQUIRED_ARGUMENT ], |