chef-provisioning-fog 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52b659938865f82a47d2bd233d5f9e4d62d4b708
-  data.tar.gz: ee9dc1faac3c6e1a2527fcd64079fd7b0521ae73
+  metadata.gz: 9f8d731be3445c285173cd5d2b8ee10ccdcc15f4
+  data.tar.gz: 062af37042b7e00d50be1f7190693712a3da158b
 SHA512:
-  metadata.gz: 469dcadcf9ca2ad0e608de694abdc3a85b3e1dd9bb677330191ef0e86c2d3041c1197ad89a678718d17980c1ea983f4987805a3593d190760972d418ab865394
-  data.tar.gz: 28fc5d4cce8c2c1b77306d32fc5592bf83eeab2d1b18c82b433c2a272e345c9c7f4b0141296d22052b85dbb82d5cc5e8a3c04c9754777b8fd4f294a28ca37bca
+  metadata.gz: 637d4be40113f7a82f9405e6f8d6bd36440214775b14203d6a8d0e20e6dcbae891c93e9c968581911a027a083b08416f86b5c4eb82a739fb0a8be5295f33638a
+  data.tar.gz: 6ca0c8f5c530eae295917895bafffdebe6f36b5c0a6aa523ee27e98ae44ef3d35d0c9884d131599c58454807c5f439d86637dbaf64729e5df1f1995ee59de18b

data/LICENSE

@@ -1,201 +1,201 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/README.md

@@ -1,3 +1,3 @@
-# chef-provisioning-fog
-
-This is the Fog driver for Chef Provisioning.  It provides Amazon EC2, Rackspace, DigitalOcean, SoftLayer, OpenStack, and vCloud Air functionality.
+# chef-provisioning-fog
+
+This is the Fog driver for Chef Provisioning.  It provides Amazon EC2, Rackspace, DigitalOcean, SoftLayer, OpenStack, vCloud Air and XenServer functionality.

data/Rakefile

@@ -1,6 +1,6 @@
-require 'bundler'
-require 'bundler/gem_tasks'
-
-task :spec do
-  require File.expand_path('spec/run')
-end
+require 'bundler'
+require 'bundler/gem_tasks'
+
+task :spec do
+  require File.expand_path('spec/run')
+end

data/lib/chef/provider/fog_key_pair.rb

@@ -1,266 +1,266 @@
-require 'chef/provider/lwrp_base'
-require 'chef/provisioning/fog_driver/driver'
-
-class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
-
-  use_inline_resources
-
-  def whyrun_supported?
-    true
-  end
-
-  action :create do
-    create_key(:create)
-  end
-
-  action :delete do
-    if current_resource_exists?
-      converge_by "delete #{key_description}" do
-        case new_driver.compute_options[:provider]
-        when 'DigitalOcean'
-          compute.destroy_ssh_key(@current_id)
-        when 'Joyent'
-          compute.delete_key(@current_id)
-        when 'OpenStack', 'Rackspace'
-          compute.key_pairs.destroy(@current_id)
-        else
-          compute.key_pairs.delete(new_resource.name)
-        end
-      end
-    end
-  end
-
-  def key_description
-    "#{new_resource.name} on #{new_driver.driver_url}"
-  end
-
-  @@use_pkcs8 = nil # For Ruby 1.9 and below, PKCS can be run
-
-  def create_key(action)
-    if @should_create_directory
-      Cheffish.inline_resource(self, action) do
-        directory run_context.config[:private_key_write_path]
-      end
-    end
-
-    if current_resource_exists?
-      # If the public keys are different, update the server public key
-      if !current_resource.private_key_path
-        if new_resource.allow_overwrite
-          ensure_keys(action)
-        else
-          raise "#{key_description} already exists on the server, but the private key #{new_private_key_path} does not exist!"
-        end
-      else
-        ensure_keys(action)
-      end
-
-      case new_driver.compute_options[:provider]
-      when 'DigitalOcean'
-        new_fingerprints = [Cheffish::KeyFormatter.encode(desired_key, :format => :openssh)]
-      when 'Joyent'
-        new_fingerprints = [Cheffish::KeyFormatter.encode(desired_key, :format => :rfc4716md5fingerprint)]
-      when 'OpenStack', 'Rackspace'
-        new_fingerprints = [Cheffish::KeyFormatter.encode(desired_key, :format => :openssh)]
-      else
-        # “The nice thing about standards is that you have so many to
-        # choose from.” - Andrew S. Tanenbaum
-        #
-        # The AWS EC2 API uses a PKCS#1 MD5 fingerprint for keys that you
-        # import into EC2, but a PKCS#8 SHA1 fingerprint for keys that you
-        # generate using its web console. Both fingerprints are different
-        # from the familiar RFC4716 MD5 fingerprint that OpenSSH displays
-        # for host keys.
-        #
-        # So compute both possible AWS fingerprints and check if either of
-        # them matches.
-        new_fingerprints = [Cheffish::KeyFormatter.encode(desired_key, :format => :fingerprint)]
-        if RUBY_VERSION.to_f < 2.0
-          if @@use_pkcs8.nil?
-            begin
-              require 'openssl_pkcs8'
-              @@use_pkcs8 = true
-            rescue LoadError
-              Chef::Log.warn("The openssl_pkcs8 gem is not loaded: you may not be able to read key fingerprints created by some cloud providers.  gem install openssl_pkcs8 to fix!")
-              @@use_pkcs8 = false
-            end
-          end
-          if @@use_pkcs8
-            new_fingerprints << Cheffish::KeyFormatter.encode(desired_private_key,
-                                  :format => :pkcs8sha1fingerprint)
-          end
-        end
-      end
-
-      if !new_fingerprints.any? { |f| compare_public_key f }
-        if new_resource.allow_overwrite
-          converge_by "update #{key_description} to match local key at #{new_resource.private_key_path}" do
-            case new_driver.compute_options[:provider]
-            when 'DigitalOcean'
-              compute.create_ssh_key(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
-            when 'Joyent'
-              compute.create_key(name: new_resource.name, key: Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
-            when 'OpenStack'
-              compute.create_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
-            when 'Rackspace'
-              compute.create_keypair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
-            else
-              compute.key_pairs.get(new_resource.name).destroy
-              compute.import_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
-            end
-          end
-        else
-          raise "#{key_description} with fingerprint #{@current_fingerprint} does not match local key fingerprint(s) #{new_fingerprints}, and allow_overwrite is false!"
-        end
-      end
-    else
-      # Generate the private and/or public keys if they do not exist
-      ensure_keys(action)
-
-      # Create key
-      converge_by "create #{key_description} from local key at #{new_resource.private_key_path}" do
-        case new_driver.compute_options[:provider]
-        when 'DigitalOcean'
-          compute.create_ssh_key(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
-        when 'Joyent'
-          compute.create_key(name: new_resource.name, key: Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
-        when 'OpenStack'
-          compute.create_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
-        when 'Rackspace'
-          compute.create_keypair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
-        else
-          compute.import_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
-        end
-      end
-    end
-  end
-
-  def new_driver
-    run_context.chef_provisioning.driver_for(new_resource.driver)
-  end
-
-  def ensure_keys(action)
-    resource = new_resource
-    private_key_path = new_private_key_path
-    Cheffish.inline_resource(self, action) do
-      private_key private_key_path do
-        public_key_path resource.public_key_path
-        if resource.private_key_options
-          resource.private_key_options.each_pair do |key,value|
-            send(key, value)
-          end
-        end
-      end
-    end
-  end
-
-  def desired_key
-    @desired_key ||= begin
-      if new_resource.public_key_path
-        public_key, format = Cheffish::KeyFormatter.decode(IO.read(new_resource.public_key_path))
-        public_key
-      else
-        desired_private_key.public_key
-      end
-    end
-  end
-
-  def desired_private_key
-    @desired_private_key ||= begin
-      private_key, format = Cheffish::KeyFormatter.decode(IO.read(new_private_key_path))
-      private_key
-    end
-  end
-
-  def current_resource_exists?
-    @current_resource.action != [ :delete ]
-  end
-
-  def compare_public_key(new)
-    c = @current_fingerprint.split[0,2].join(' ')
-    n = new.split[0,2].join(' ')
-    c == n
-  end
-
-  def compute
-    new_driver.compute
-  end
-
-  def current_public_key
-    current_resource.source_key
-  end
-
-  def new_private_key_path
-    private_key_path = new_resource.private_key_path || new_resource.name
-    if private_key_path.is_a?(Symbol)
-      private_key_path
-    elsif Pathname.new(private_key_path).relative? && new_driver.config[:private_key_write_path]
-      @should_create_directory = true
-      ::File.join(new_driver.config[:private_key_write_path], private_key_path)
-    else
-      private_key_path
-    end
-  end
-
-  def new_public_key_path
-    new_resource.public_key_path
-  end
-
-  def load_current_resource
-    if !new_driver.kind_of?(Chef::Provisioning::FogDriver::Driver)
-      raise 'fog_key_pair only works with fog_driver'
-    end
-    @current_resource = Chef::Resource::FogKeyPair.new(new_resource.name, run_context)
-    case new_driver.provider
-    when 'DigitalOcean'
-      current_key_pair = compute.ssh_keys.select { |key| key.name == new_resource.name }.first
-      if current_key_pair
-        @current_id = current_key_pair.id
-        @current_fingerprint = current_key_pair ? compute.ssh_keys.get(@current_id).ssh_pub_key : nil
-      else
-        current_resource.action :delete
-      end
-    when 'Joyent'
-      current_key_pair = begin
-        compute.keys.get(new_resource.name)
-      rescue Fog::Compute::Joyent::Errors::NotFound
-        nil
-      end
-      if current_key_pair
-        @current_id = current_key_pair.name
-        @current_fingerprint = if current_key_pair.respond_to?(:fingerprint)
-          current_key_pair.fingerprint
-        elsif current_key_pair.respond_to?(:key)
-          public_key, format = Cheffish::KeyFormatter.decode(current_key_pair.key)
-          public_key.fingerprint
-        else
-          nil
-        end
-      else
-        current_resource.action :delete
-      end
-    when 'OpenStack', 'Rackspace'
-      current_key_pair = compute.key_pairs.get(new_resource.name)
-      if current_key_pair
-        @current_id = current_key_pair.name
-        @current_fingerprint = current_key_pair ? compute.key_pairs.get(@current_id).public_key : nil
-      else
-        current_resource.action :delete
-      end
-    else
-      current_key_pair = compute.key_pairs.get(new_resource.name)
-      if current_key_pair
-        @current_fingerprint = current_key_pair ? current_key_pair.fingerprint : nil
-      else
-        current_resource.action :delete
-      end
-    end
-
-    if new_private_key_path && ::File.exist?(new_private_key_path)
-      current_resource.private_key_path new_private_key_path
-    end
-    if new_public_key_path && ::File.exist?(new_public_key_path)
-      current_resource.public_key_path new_public_key_path
-    end
-  end
-end
+require 'chef/provider/lwrp_base'
+require 'chef/provisioning/fog_driver/driver'
+
+class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
+
+  use_inline_resources
+
+  def whyrun_supported?
+    true
+  end
+
+  action :create do
+    create_key(:create)
+  end
+
+  action :delete do
+    if current_resource_exists?
+      converge_by "delete #{key_description}" do
+        case new_driver.compute_options[:provider]
+        when 'DigitalOcean'
+          compute.destroy_ssh_key(@current_id)
+        when 'Joyent'
+          compute.delete_key(@current_id)
+        when 'OpenStack', 'Rackspace'
+          compute.key_pairs.destroy(@current_id)
+        else
+          compute.key_pairs.delete(new_resource.name)
+        end
+      end
+    end
+  end
+
+  def key_description
+    "#{new_resource.name} on #{new_driver.driver_url}"
+  end
+
+  @@use_pkcs8 = nil # For Ruby 1.9 and below, PKCS can be run
+
+  def create_key(action)
+    if @should_create_directory
+      Cheffish.inline_resource(self, action) do
+        directory run_context.config[:private_key_write_path]
+      end
+    end
+
+    if current_resource_exists?
+      # If the public keys are different, update the server public key
+      if !current_resource.private_key_path
+        if new_resource.allow_overwrite
+          ensure_keys(action)
+        else
+          raise "#{key_description} already exists on the server, but the private key #{new_private_key_path} does not exist!"
+        end
+      else
+        ensure_keys(action)
+      end
+
+      case new_driver.compute_options[:provider]
+      when 'DigitalOcean'
+        new_fingerprints = [Cheffish::KeyFormatter.encode(desired_key, :format => :openssh)]
+      when 'Joyent'
+        new_fingerprints = [Cheffish::KeyFormatter.encode(desired_key, :format => :rfc4716md5fingerprint)]
+      when 'OpenStack', 'Rackspace'
+        new_fingerprints = [Cheffish::KeyFormatter.encode(desired_key, :format => :openssh)]
+      else
+        # “The nice thing about standards is that you have so many to
+        # choose from.” - Andrew S. Tanenbaum
+        #
+        # The AWS EC2 API uses a PKCS#1 MD5 fingerprint for keys that you
+        # import into EC2, but a PKCS#8 SHA1 fingerprint for keys that you
+        # generate using its web console. Both fingerprints are different
+        # from the familiar RFC4716 MD5 fingerprint that OpenSSH displays
+        # for host keys.
+        #
+        # So compute both possible AWS fingerprints and check if either of
+        # them matches.
+        new_fingerprints = [Cheffish::KeyFormatter.encode(desired_key, :format => :fingerprint)]
+        if RUBY_VERSION.to_f < 2.0
+          if @@use_pkcs8.nil?
+            begin
+              require 'openssl_pkcs8'
+              @@use_pkcs8 = true
+            rescue LoadError
+              Chef::Log.warn("The openssl_pkcs8 gem is not loaded: you may not be able to read key fingerprints created by some cloud providers.  gem install openssl_pkcs8 to fix!")
+              @@use_pkcs8 = false
+            end
+          end
+          if @@use_pkcs8
+            new_fingerprints << Cheffish::KeyFormatter.encode(desired_private_key,
+                                  :format => :pkcs8sha1fingerprint)
+          end
+        end
+      end
+
+      if !new_fingerprints.any? { |f| compare_public_key f }
+        if new_resource.allow_overwrite
+          converge_by "update #{key_description} to match local key at #{new_resource.private_key_path}" do
+            case new_driver.compute_options[:provider]
+            when 'DigitalOcean'
+              compute.create_ssh_key(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
+            when 'Joyent'
+              compute.create_key(name: new_resource.name, key: Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
+            when 'OpenStack'
+              compute.create_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
+            when 'Rackspace'
+              compute.create_keypair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
+            else
+              compute.key_pairs.get(new_resource.name).destroy
+              compute.import_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
+            end
+          end
+        else
+          raise "#{key_description} with fingerprint #{@current_fingerprint} does not match local key fingerprint(s) #{new_fingerprints}, and allow_overwrite is false!"
+        end
+      end
+    else
+      # Generate the private and/or public keys if they do not exist
+      ensure_keys(action)
+
+      # Create key
+      converge_by "create #{key_description} from local key at #{new_resource.private_key_path}" do
+        case new_driver.compute_options[:provider]
+        when 'DigitalOcean'
+          compute.create_ssh_key(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
+        when 'Joyent'
+          compute.create_key(name: new_resource.name, key: Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
+        when 'OpenStack'
+          compute.create_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
+        when 'Rackspace'
+          compute.create_keypair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
+        else
+          compute.import_key_pair(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
+        end
+      end
+    end
+  end
+
+  def new_driver
+    run_context.chef_provisioning.driver_for(new_resource.driver)
+  end
+
+  def ensure_keys(action)
+    resource = new_resource
+    private_key_path = new_private_key_path
+    Cheffish.inline_resource(self, action) do
+      private_key private_key_path do
+        public_key_path resource.public_key_path
+        if resource.private_key_options
+          resource.private_key_options.each_pair do |key,value|
+            send(key, value)
+          end
+        end
+      end
+    end
+  end
+
+  def desired_key
+    @desired_key ||= begin
+      if new_resource.public_key_path
+        public_key, format = Cheffish::KeyFormatter.decode(IO.read(new_resource.public_key_path))
+        public_key
+      else
+        desired_private_key.public_key
+      end
+    end
+  end
+
+  def desired_private_key
+    @desired_private_key ||= begin
+      private_key, format = Cheffish::KeyFormatter.decode(IO.read(new_private_key_path))
+      private_key
+    end
+  end
+
+  def current_resource_exists?
+    @current_resource.action != [ :delete ]
+  end
+
+  def compare_public_key(new)
+    c = @current_fingerprint.split[0,2].join(' ')
+    n = new.split[0,2].join(' ')
+    c == n
+  end
+
+  def compute
+    new_driver.compute
+  end
+
+  def current_public_key
+    current_resource.source_key
+  end
+
+  def new_private_key_path
+    private_key_path = new_resource.private_key_path || new_resource.name
+    if private_key_path.is_a?(Symbol)
+      private_key_path
+    elsif Pathname.new(private_key_path).relative? && new_driver.config[:private_key_write_path]
+      @should_create_directory = true
+      ::File.join(new_driver.config[:private_key_write_path], private_key_path)
+    else
+      private_key_path
+    end
+  end
+
+  def new_public_key_path
+    new_resource.public_key_path
+  end
+
+  def load_current_resource
+    if !new_driver.kind_of?(Chef::Provisioning::FogDriver::Driver)
+      raise 'fog_key_pair only works with fog_driver'
+    end
+    @current_resource = Chef::Resource::FogKeyPair.new(new_resource.name, run_context)
+    case new_driver.provider
+    when 'DigitalOcean'
+      current_key_pair = compute.ssh_keys.select { |key| key.name == new_resource.name }.first
+      if current_key_pair
+        @current_id = current_key_pair.id
+        @current_fingerprint = current_key_pair ? compute.ssh_keys.get(@current_id).ssh_pub_key : nil
+      else
+        current_resource.action :delete
+      end
+    when 'Joyent'
+      current_key_pair = begin
+        compute.keys.get(new_resource.name)
+      rescue Fog::Compute::Joyent::Errors::NotFound
+        nil
+      end
+      if current_key_pair
+        @current_id = current_key_pair.name
+        @current_fingerprint = if current_key_pair.respond_to?(:fingerprint)
+          current_key_pair.fingerprint
+        elsif current_key_pair.respond_to?(:key)
+          public_key, format = Cheffish::KeyFormatter.decode(current_key_pair.key)
+          public_key.fingerprint
+        else
+          nil
+        end
+      else
+        current_resource.action :delete
+      end
+    when 'OpenStack', 'Rackspace'
+      current_key_pair = compute.key_pairs.get(new_resource.name)
+      if current_key_pair
+        @current_id = current_key_pair.name
+        @current_fingerprint = current_key_pair ? compute.key_pairs.get(@current_id).public_key : nil
+      else
+        current_resource.action :delete
+      end
+    else
+      current_key_pair = compute.key_pairs.get(new_resource.name)
+      if current_key_pair
+        @current_fingerprint = current_key_pair ? current_key_pair.fingerprint : nil
+      else
+        current_resource.action :delete
+      end
+    end
+
+    if new_private_key_path && ::File.exist?(new_private_key_path)
+      current_resource.private_key_path new_private_key_path
+    end
+    if new_public_key_path && ::File.exist?(new_public_key_path)
+      current_resource.public_key_path new_public_key_path
+    end
+  end
+end