diff options
| author | Pieter van de Bruggen <pieter@puppetlabs.com> | 2011-07-25 12:05:31 -0700 |
|---|---|---|
| committer | Pieter van de Bruggen <pieter@puppetlabs.com> | 2011-07-25 12:05:31 -0700 |
| commit | 10e05ad302d1b2d93f5da070d612817729473009 (patch) | |
| tree | 208b9d6a369437eda49afe6d2ed08b540e20b0b2 /lib/puppet/application | |
| parent | 29a25abe7a6e04d2b2f78b604aca3d819f010d38 (diff) | |
| download | puppet-10e05ad302d1b2d93f5da070d612817729473009.tar.gz puppet-10e05ad302d1b2d93f5da070d612817729473009.tar.xz puppet-10e05ad302d1b2d93f5da070d612817729473009.zip | |
(#7266) Move Certificate option validation into face.
The validation for the ca_location option on the certificate
application continued to hang around on the application long
after the face realized its potential to take responsibility
for itself. This change moves (and adds) validation code as
appropriate into the Face.
Reviewed-By: Matt Robinson
Diffstat (limited to 'lib/puppet/application')
| -rw-r--r-- | lib/puppet/application/certificate.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/puppet/application/certificate.rb b/lib/puppet/application/certificate.rb index eacb830b2..de5b2c499 100644 --- a/lib/puppet/application/certificate.rb +++ b/lib/puppet/application/certificate.rb @@ -2,11 +2,6 @@ require 'puppet/application/indirection_base' class Puppet::Application::Certificate < Puppet::Application::IndirectionBase def setup - unless options[:ca_location] - raise ArgumentError, "You must have a CA location specified;\n" + - "use --ca-location to specify the location (remote, local, only)" - end - location = Puppet::SSL::Host.ca_location if location == :local && !Puppet::SSL::CertificateAuthority.ca? self.class.run_mode("master") |