summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-01-16 10:50:23 -0800
committerTim Smith <tsmith@chef.io>2019-01-16 10:50:23 -0800
commit82ac2c40763dfe57cd2efaa07126d26829716cf2 (patch)
treeda9b1b443065bae398da90a168edb0017fc8ea0e
parentc86f10dfb9c898874a58cff92804ef437e3e8e98 (diff)
downloadchef-82ac2c40763dfe57cd2efaa07126d26829716cf2.tar.gz
Make sure openssl resources properly use the name_propertyopenssl
We have a name_property, but we're not using it everywhere here. Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--lib/chef/resource/openssl_ec_private_key.rb2
-rw-r--r--lib/chef/resource/openssl_x509_request.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/resource/openssl_ec_private_key.rb b/lib/chef/resource/openssl_ec_private_key.rb
index 06fec2939b..dc8cd060d6 100644
--- a/lib/chef/resource/openssl_ec_private_key.rb
+++ b/lib/chef/resource/openssl_ec_private_key.rb
@@ -67,7 +67,7 @@ class Chef
unless new_resource.force || priv_key_file_valid?(new_resource.path, new_resource.key_pass)
converge_by("Create an EC private key #{new_resource.path}") do
log "Generating an #{new_resource.key_curve} "\
- "EC key file at #{new_resource.name}, this may take some time"
+ "EC key file at #{new_resource.path}, this may take some time"
if new_resource.key_pass
unencrypted_ec_key = gen_ec_priv_key(new_resource.key_curve)
diff --git a/lib/chef/resource/openssl_x509_request.rb b/lib/chef/resource/openssl_x509_request.rb
index 6e5e182f31..affc761723 100644
--- a/lib/chef/resource/openssl_x509_request.rb
+++ b/lib/chef/resource/openssl_x509_request.rb
@@ -88,7 +88,7 @@ class Chef
unless ::File.exist? new_resource.path
converge_by("Create CSR #{@new_resource}") do
- file new_resource.name do
+ file new_resource.path do
owner new_resource.owner unless new_resource.owner.nil?
group new_resource.group unless new_resource.group.nil?
mode new_resource.mode unless new_resource.mode.nil?