chef-metal-fog 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ab481529a81ba71c5d9abb6432a399c4d6f1bb7
-  data.tar.gz: 727b503c48bd6064d37f9c512347ec6d16aa0111
+  metadata.gz: 927b70a0bdd36d1e004c168d90d71c9e18bf6608
+  data.tar.gz: e8152c40c1ec3c0b866d6189dfc0df1da81fa30f
 SHA512:
-  metadata.gz: a1b422d9526c41aee107ffc58e6ebaecb471f2c3b69d21210473e9ca603fc62a5b6ac0476a632feca41d3b2ef5c55fd9138b5ab7364354c6c858077e0e83addf
-  data.tar.gz: 30195a484d57766d08ba97b31eff98437b7bc49cd016a50d4515cebdcce549c10fec2b7b199a7473c634fbb22bc1fafe0f006f9120b399df04a8e05486cb0bd8
+  metadata.gz: 0f389c377ec27b9cc391e635e045e8141ac9615d41e3a5beeba721e5dd3166b61f57576f4a6dca33f22ad5415ba7a89b0121d3bd5ab9d16995bf84966543592e
+  data.tar.gz: 7b807bdf75b5062c328c29ef3b41d216979a67456240e3a494c00a69920ce71c03a40baacba01d239b2420007647a90f211ea15aba3af59791d93b9874df965d

data/lib/chef_metal/provisioner_init/fog_init.rb

@@ -1,4 +1,4 @@
-require 'chef_metal/provisioner/fog_provisioner'
+require 'chef_metal_fog/fog_provisioner'
 
 ChefMetal.add_registered_provisioner_class("fog",
-  ChefMetal::Provisioner::FogProvisioner)
+  ChefMetalFog::FogProvisioner)

data/lib/chef_metal_fog/fog_provisioner.rb

@@ -8,7 +8,9 @@ require 'chef_metal/convergence_strategy/install_msi'
 require 'chef_metal/convergence_strategy/install_cached'
 require 'chef_metal/transport/ssh'
 require 'fog'
+require 'fog/core'
 require 'fog/compute'
+require 'fog/aws'
 
 module ChefMetalFog
   # Provisions machines in vagrant.
@@ -152,19 +154,12 @@ module ChefMetalFog
       # Set up the modified node data
       provisioner_output = node['normal']['provisioner_output'] || {
         'provisioner_url' => provisioner_url,
-        'provisioner_version' => ChefMetal::VERSION,
+        'provisioner_version' => ChefMetalFog::VERSION,
         'creator' => aws_login_info[1]
       }
 
       if provisioner_output['provisioner_url'] != provisioner_url
-        if (provisioner_output['provisioner_version'].to_f <= 0.3) && provisioner_output['provisioner_url'].start_with?('fog:AWS:') && compute_options[:provider] == 'AWS'
-          Chef::Log.warn "The upgrade from chef-metal 0.3 to 0.4 changed the provisioner URL format!  Metal will assume you are in fact using the same AWS account, and modify the provisioner URL to match."
-          provisioner_output['provisioner_url'] = provisioner_url
-          provisioner_output['provisioner_version'] ||= ChefMetal::VERSION
-          provisioner_output['creator'] ||= aws_login_info[1]
-        else
-          raise "Switching providers for a machine is not currently supported!  Use machine :destroy and then re-create the machine on the new action_handler."
-        end
+        raise "Switching a machine's provider from #{provisioner_output['provisioner_url']} to #{provisioner_url} for is not currently supported!  Use machine :destroy and then re-create the machine on the new provisioner."
       end
 
       node['normal']['provisioner_output'] = provisioner_output
@@ -332,7 +327,6 @@ module ChefMetalFog
       @base_bootstrap_options_for[machine] = current_base_bootstrap_options
     end
 
-
     def compute
       @compute ||= Fog::Compute.new(compute_options)
     end
@@ -466,11 +460,17 @@ module ChefMetalFog
     def convergence_strategy_for(node)
       if node['normal']['provisioner_options'] && node['normal']['provisioner_options']['is_windows']
         @windows_convergence_strategy ||= begin
-          ChefMetal::ConvergenceStrategy::InstallMsi.new
+          options = {}
+          provisioner_options = node['normal']['provisioner_options'] || {}
+          options[:chef_client_timeout] = provisioner_options['chef_client_timeout'] if provisioner_options.has_key?('chef_client_timeout')
+          ChefMetal::ConvergenceStrategy::InstallMsi.new(options)
         end
       else
         @unix_convergence_strategy ||= begin
-          ChefMetal::ConvergenceStrategy::InstallCached.new
+          options = {}
+          provisioner_options = node['normal']['provisioner_options'] || {}
+          options[:chef_client_timeout] = provisioner_options['chef_client_timeout'] if provisioner_options.has_key?('chef_client_timeout')
+          ChefMetal::ConvergenceStrategy::InstallCached.new(options)
         end
       end
     end

data/lib/chef_metal_fog/version.rb

@@ -1,3 +1,3 @@
 module ChefMetalFog
-  VERSION = '0.1'
+  VERSION = '0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal-fog
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef