diff options
Diffstat (limited to 'lib/puppet/ssl/certificate_request.rb')
| -rw-r--r-- | lib/puppet/ssl/certificate_request.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/puppet/ssl/certificate_request.rb b/lib/puppet/ssl/certificate_request.rb index 8ef0b800e..2c93a9c56 100644 --- a/lib/puppet/ssl/certificate_request.rb +++ b/lib/puppet/ssl/certificate_request.rb @@ -11,6 +11,9 @@ class Puppet::SSL::CertificateRequest < Puppet::SSL::Base def generate(key) Puppet.info "Creating a new SSL certificate request for %s" % name + # Support either an actual SSL key, or a Puppet key. + key = key.content if key.is_a?(Puppet::SSL::Key) + csr = OpenSSL::X509::Request.new csr.version = 0 csr.subject = OpenSSL::X509::Name.new([["CN", name]]) |