diff options
| author | Pieter van de Bruggen <pieter@puppetlabs.com> | 2011-07-25 12:06:35 -0700 |
|---|---|---|
| committer | Pieter van de Bruggen <pieter@puppetlabs.com> | 2011-07-25 12:06:35 -0700 |
| commit | d19fc2b34ddbb26c68edf6890588b771ec550cfd (patch) | |
| tree | 38a7ae9a0ce99f53f5a0e4c64e4ec332a3827a5a /lib/puppet/application | |
| parent | d522b0b824285d025884ff271cda957df1c9951d (diff) | |
| parent | 10e05ad302d1b2d93f5da070d612817729473009 (diff) | |
| download | puppet-d19fc2b34ddbb26c68edf6890588b771ec550cfd.tar.gz puppet-d19fc2b34ddbb26c68edf6890588b771ec550cfd.tar.xz puppet-d19fc2b34ddbb26c68edf6890588b771ec550cfd.zip | |
Merge branch 'tickets/2.7.x/7266' into 2.7.x
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") |