chef-provisioning-fog 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aaf6579771b48654165dcc7ede21e3d60c8a80fe
-  data.tar.gz: 57a93d7417190ba9e5f9b7fdc56e0364e2c654f3
+  metadata.gz: 7e8d9aff16a913485687ea30699bc056f40f6550
+  data.tar.gz: 00049afa78c2598b84dd90a1fd019dd9655f4c5b
 SHA512:
-  metadata.gz: bce04b039918073b474e6d039cf07f0b3d59ff9dc4f4d317a436b46e21d61eaa4cdaeac5b06a126a8cd4034c79a545a5680da0dacc9d8b028704196827452df7
-  data.tar.gz: 3138f0debc2d93f818fbd7e618db2ae420d85b4c58f066c254d83d400fb3ff4807da5143522739e096a2281ca0333cbc21495e5352ee8590c1fc51c91c47521e
+  metadata.gz: b95693417ce3f1791dd1e08ab1448c8250cb6c660aa2df21fe427dc8f0c1a43c927b59e89ca94bbdffe3c0654594a076fce3e0cf2fc21854c56a4666b8d5dc45
+  data.tar.gz: cd886bb181cad6dddb995d7bf0abecdf0fadd4df59cf2b9cf9bf5fcf238011a39f74bbb3088c2acbce46fd18f9030e735720d201892586ee4402455b0dadf8af

data/README.md

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

data/lib/chef/provisioning/fog_driver/providers/digitalocean.rb

@@ -37,25 +37,39 @@ module FogDriver
             bootstrap_options[:image_distribution] = 'CentOS'
             bootstrap_options[:image_name] = '6.5 x64'
           end
-          matches = compute.images.select { |image| image.distribution == bootstrap_options[:image_distribution] }
-          matches = matches.select { |image| image.name == bootstrap_options[:image_name] } if bootstrap_options[:image_name]
-          if matches.empty?
+          distributions = compute.images.select { |image| image.distribution == bootstrap_options[:image_distribution] }
+          if distributions.empty?
+            raise "No images on DigitalOcean with distribution #{bootstrap_options[:image_distribution].inspect}"
+          end
+          images = distributions.select { |image| image.name == bootstrap_options[:image_name] } if bootstrap_options[:image_name]
+          if images.empty?
             raise "No images on DigitalOcean with distribution #{bootstrap_options[:image_distribution].inspect} and name #{bootstrap_options[:image_name].inspect}"
           end
-          bootstrap_options[:image_id] = matches.first.id
+          bootstrap_options[:image_id] = images.first.id
         end
         if !bootstrap_options[:flavor_id]
           bootstrap_options[:flavor_name] ||= '512MB'
-          bootstrap_options[:flavor_id] = compute.flavors.select { |flavor| flavor.name == bootstrap_options[:flavor_name] }.first.id
+          flavors = compute.flavors.select do |f|
+            f.name == bootstrap_options[:flavor_name]
+          end
+          if flavors.empty?
+            raise "Could not find flavor named '#{bootstrap_options[:flavor_name]}' on #{driver_url}"
+          end
+          bootstrap_options[:flavor_id] = flavors.first.id
         end
         if !bootstrap_options[:region_id]
           bootstrap_options[:region_name] ||= 'San Francisco 1'
-          bootstrap_options[:region_id] = compute.regions.select { |region| region.name == bootstrap_options[:region_name] }.first.id
+          regions = compute.regions.select { |region| region.name == bootstrap_options[:region_name] }
+          if regions.empty?
+            raise "Could not find region named '#{bootstrap_options[:region_name]}' on #{driver_url}"
+          end
+          bootstrap_options[:region_id] = regions.first.id
         end
-        found_key = compute.ssh_keys.select { |k| k.name == bootstrap_options[:key_name] }.first
-        if !found_key
+        keys = compute.ssh_keys.select { |k| k.name == bootstrap_options[:key_name] }
+        if keys.empty?
           raise "Could not find key named '#{bootstrap_options[:key_name]}' on #{driver_url}"
         end
+        found_key = keys.first
         bootstrap_options[:ssh_key_ids] ||= [ found_key.id ]
 
         # You don't get to specify name yourself

data/lib/chef/provisioning/fog_driver/providers/softlayer.rb

@@ -0,0 +1,36 @@
+class Chef
+  module Provisioning
+    module FogDriver
+      module Providers
+        class SoftLayer < FogDriver::Driver
+          Driver.register_provider_class('SoftLayer', FogDriver::Providers::SoftLayer)
+
+          def creator
+            compute_options[:softlayer_username]
+          end
+
+          def self.compute_options_for(provider, id, config)
+            new_compute_options = {}
+            new_compute_options[:provider] = provider
+            new_config = { :driver_options => { :compute_options => new_compute_options }}
+            new_defaults = {
+              :driver_options => { :compute_options => {} },
+              :machine_options => { :bootstrap_options => {} }
+            }
+            result = Cheffish::MergedConfig.new(new_config, config, new_defaults)
+
+            credential = Fog.credentials
+
+            new_compute_options[:softlayer_username] ||= credential[:softlayer_username]
+            new_compute_options[:softlayer_api_key] ||= credential[:softlayer_api_key]
+
+            id = result[:driver_options][:compute_options][:softlayer_auth_url]
+
+            [result, id]
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/chef/provisioning/fog_driver/version.rb

@@ -1,7 +1,7 @@
 class Chef
 module Provisioning
 module FogDriver
-  VERSION = '0.13.1'
+  VERSION = '0.13.2'
 end
 end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-fog
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +115,7 @@ files:
 - lib/chef/provisioning/fog_driver/providers/joyent.rb
 - lib/chef/provisioning/fog_driver/providers/openstack.rb
 - lib/chef/provisioning/fog_driver/providers/rackspace.rb
+- lib/chef/provisioning/fog_driver/providers/softlayer.rb
 - lib/chef/provisioning/fog_driver/recipe_dsl.rb
 - lib/chef/provisioning/fog_driver/version.rb
 - lib/chef/resource/fog_key_pair.rb
@@ -144,8 +145,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Driver for creating Fog instances in Chef Provisioning.
 test_files: []
+has_rdoc: