summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-09-18 11:15:25 -0700
committerGitHub <noreply@github.com>2018-09-18 11:15:25 -0700
commit8b249436b95f9ffa4787b883e7367bfb498ed122 (patch)
tree85b81aaa4a98bb8fd637846ae541aa2ed9445f9f
parent5e4ee84e064cf5e1a05066e8986f38c72cbaf3ad (diff)
parent0d5bd240bd417104fe477ed677a33359c2f0c6fb (diff)
downloadchef-8b249436b95f9ffa4787b883e7367bfb498ed122.tar.gz
Merge pull request #7660 from chef/openssl
Wire up openssl_x509
-rw-r--r--lib/chef/resource/openssl_x509_certificate.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/resource/openssl_x509_certificate.rb b/lib/chef/resource/openssl_x509_certificate.rb
index fcbcc650a0..192b56026a 100644
--- a/lib/chef/resource/openssl_x509_certificate.rb
+++ b/lib/chef/resource/openssl_x509_certificate.rb
@@ -26,7 +26,7 @@ class Chef
preview_resource true
resource_name :openssl_x509_certificate
- # provides(:openssl_x509) { true } # legacy cookbook name. Cookbook will win for now. @todo Uncomment this for Chef 15
+ provides(:openssl_x509) { true } # legacy cookbook name.
description "Use the openssl_x509_certificate resource to generate signed or self-signed, PEM-formatted x509 certificates. If no existing key is specified, the resource will automatically generate a passwordless key with the certificate. If a CA private key and certificate are provided, the certificate will be signed with them. Note: This resource was renamed from openssl_x509 to openssl_x509_certificate. The legacy name will continue to function, but cookbook code should be updated for the new resource name."
introduced "14.4"