chef-metal-fog 0.5.beta.6 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 808835083ceaf7db0de62541e834b4730d8ea919
-  data.tar.gz: d3333babf02cf215c515e78c8167fe9df22b0570
+  metadata.gz: ba70e5d354ec37158152081d939429461f6cbcee
+  data.tar.gz: d268dfc2afebd4072e31cafb3eb58d3255df80c1
 SHA512:
-  metadata.gz: 54d7c00be7001d256832652f8d78865ed2a7eb43fc6e3a273c255aa24dd37d53e020a301067e9fd079d55528a27ca8b967a10b333ef67fe3fe1846523045f3bd
-  data.tar.gz: c5338a27a82b1d1f750feae7cb72214e064b65cce937b6b69afff0183b3d560f28dbe3567160d90b886a0f61069df683cf12808c1dc0ee2cf6941a531ac3393d
+  metadata.gz: 09255981c637779902d5e70fdfb636eefa425807d374d9f81ed54e7d8a4243ce63bd796cb838e78b7653cc53f7ec8e3cd96c6412315879bef24f654507fc09b7
+  data.tar.gz: 5d2d21cf7f9a3d76513034c11d78e54a4a578b9ddcde859cf14048fcaa04d44a3c207274097bfd8a7b38ef1048a955fa06bfc72f13db6626a977e31d53565609

data/lib/chef/provider/fog_key_pair.rb

@@ -81,8 +81,10 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
             case new_driver.compute_options[:provider]
             when 'DigitalOcean'
               compute.create_ssh_key(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
-            when 'OpenStack', 'Rackspace'
+            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))
@@ -101,8 +103,10 @@ class Chef::Provider::FogKeyPair < Chef::Provider::LWRPBase
         case new_driver.compute_options[:provider]
         when 'DigitalOcean'
           compute.create_ssh_key(new_resource.name, Cheffish::KeyFormatter.encode(desired_key, :format => :openssh))
-        when 'OpenStack', 'Rackspace'
+        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

data/lib/chef_metal_fog/fog_driver.rb

@@ -3,6 +3,7 @@ require 'chef_metal/machine/windows_machine'
 require 'chef_metal/machine/unix_machine'
 require 'chef_metal/machine_spec'
 require 'chef_metal/convergence_strategy/install_msi'
+require 'chef_metal/convergence_strategy/install_sh'
 require 'chef_metal/convergence_strategy/install_cached'
 require 'chef_metal/convergence_strategy/no_converge'
 require 'chef_metal/transport/ssh'
@@ -117,13 +118,10 @@ module ChefMetalFog
     def self.from_provider(provider, config)
       # Figure out the options and merge them into the config
       config, id = compute_options_for(provider, nil, config)
-      driver_options = config[:driver_options] || {}
-      compute_options = driver_options[:compute_options] || {}
 
       driver_url = "fog:#{provider}:#{id}"
 
-      config = ChefMetal.config_for_url(driver_url, config)
-      FogDriver.new(driver_url, config)
+      ChefMetal.driver_for_url(driver_url, config)
     end
 
     # Create a new fog driver.
@@ -479,8 +477,10 @@ module ChefMetalFog
 
       if machine_spec.location['is_windows']
         ChefMetal::ConvergenceStrategy::InstallMsi.new(machine_options[:convergence_options], config)
-      else
+      elsif machine_options[:cached_installer] == true
         ChefMetal::ConvergenceStrategy::InstallCached.new(machine_options[:convergence_options], config)
+      else
+        ChefMetal::ConvergenceStrategy::InstallSh.new(machine_options[:convergence_options], config)
       end
     end
 
@@ -590,9 +590,9 @@ module ChefMetalFog
       when 'AWS'
         # Grab the profile
         aws_profile = FogDriverAWS.get_aws_profile(result[:driver_options], id)
-        [ :aws_access_key_id, :aws_secret_access_key, :aws_security_token].each do |key|
-          new_compute_options[key] = aws_profile[key]
-        end
+        new_compute_options[:aws_access_key_id] = aws_profile[:aws_access_key_id]
+        new_compute_options[:aws_secret_access_key] = aws_profile[:aws_secret_access_key]
+        new_compute_options[:aws_session_token] = aws_profile[:aws_security_token]
         # For :region, we prefer the region in compute options or URL over the region in the profile.
         new_compute_options[:region] ||= aws_profile[:region] if aws_profile.has_key?(:region) && !compute_options.has_key?(:region)
       when 'OpenStack'
@@ -606,7 +606,7 @@ module ChefMetalFog
         new_compute_options[:openstack_auth_url] ||= credential[:openstack_auth_url]
         new_compute_options[:openstack_tenant] ||= credential[:openstack_tenant]
       when 'Rackspace'
-        credential = Fog.credential
+        credential = Fog.credentials
 
         new_compute_options[:rackspace_username] ||= credential[:rackspace_username]
         new_compute_options[:rackspace_api_key] ||= credential[:rackspace_api_key]

data/lib/chef_metal_fog/fog_driver_aws.rb

@@ -6,21 +6,22 @@ module ChefMetalFog
   module FogDriverAWS
     def self.get_aws_profile(driver_options, aws_account_id)
       aws_credentials = get_aws_credentials(driver_options)
+      compute_options = driver_options[:compute_options] || {}
 
       # Order of operations:
-      # driver_options[:aws_access_key_id] / driver_options[:aws_secret_access_key] / driver_options[:aws_security_token] / driver_options[:region]
-      # driver_options[:aws_profile]
+      # compute_options[:aws_access_key_id] / compute_options[:aws_secret_access_key] / compute_options[:aws_security_token] / compute_options[:region]
+      # compute_options[:aws_profile]
       # ENV['AWS_ACCESS_KEY_ID'] / ENV['AWS_SECRET_ACCESS_KEY'] / ENV['AWS_SECURITY_TOKEN'] / ENV['AWS_REGION']
       # ENV['AWS_PROFILE']
       # ENV['DEFAULT_PROFILE']
       # 'default'
-      aws_profile = if driver_options[:aws_access_key_id]
+      aws_profile = if compute_options[:aws_access_key_id]
         Chef::Log.debug("Using AWS driver access key options")
         {
-          :aws_access_key_id => driver_options[:aws_access_key_id],
-          :aws_secret_access_key => driver_options[:aws_secret_access_key],
-          :aws_security_token => driver_options[:aws_security_token],
-          :region => driver_options[:region]
+          :aws_access_key_id => compute_options[:aws_access_key_id],
+          :aws_secret_access_key => compute_options[:aws_secret_access_key],
+          :aws_security_token => compute_options[:aws_session_token],
+          :region => compute_options[:region]
         }
       elsif driver_options[:aws_profile]
         Chef::Log.debug("Using AWS profile #{driver_options[:aws_profile]}")

data/lib/chef_metal_fog/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalFog
-  VERSION = '0.5.beta.6'
+  VERSION = '0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal-fog
 version: !ruby/object:Gem::Version
-  version: 0.5.beta.6
+  version: '0.5'
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -114,9 +114,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2