diff options
author | vasu1105 <vasundhara.jagdale@msystechnologies.com> | 2018-11-29 15:03:29 +0530 |
---|---|---|
committer | Tim Smith <tsmith@chef.io> | 2018-12-19 17:19:12 -0800 |
commit | 65bdfa3daa4a1f52ae840f4e68edfedeaf1c6ffe (patch) | |
tree | 5347e7f883d4ce09e72bb65e7cfff9f94fa4b7b0 /lib/chef/resource | |
parent | fcddc6f71e349ffee0eadefe009534b973a6a1e8 (diff) | |
download | chef-65bdfa3daa4a1f52ae840f4e68edfedeaf1c6ffe.tar.gz |
MSYS-936 Fix for windows certificate delete action fails if certificate doesn't exist
Signed-off-by: vasu1105 <vasundhara.jagdale@msystechnologies.com>
Diffstat (limited to 'lib/chef/resource')
-rw-r--r-- | lib/chef/resource/windows_certificate.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/chef/resource/windows_certificate.rb b/lib/chef/resource/windows_certificate.rb index b482a09cc4..20613a76bd 100644 --- a/lib/chef/resource/windows_certificate.rb +++ b/lib/chef/resource/windows_certificate.rb @@ -59,7 +59,6 @@ class Chef action :create do description "Creates or updates a certificate." - add_cert(OpenSSL::X509::Certificate.new(raw_source)) end @@ -91,8 +90,12 @@ class Chef action :delete do description "Deletes a certificate." - - delete_cert + cert_obj = fetch_cert + if cert_obj + converge_by("Deleting certificate #{new_resource.source} from Store #{new_resource.store_name}") do + delete_cert + end + end end action :fetch do |