chef-metal 0.3 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b141298163e702535479301b6c88044960e65cc0
-  data.tar.gz: 64383c31616aa7fce1f7785d41134b6516d9b51d
+  metadata.gz: b55bda561c7c8ea4e4ee5634ad368dfb2c42f6ef
+  data.tar.gz: 03c66248dee33dc38e0c314fef3ea97ec6842212
 SHA512:
-  metadata.gz: b86349e657a31e3594823b7036aac2c6fd2e5cf2e629da6d1db58a4069502a494bade45142d19db91533cfa66b698600c78f910955cf18a9d8ea0d5754c0e812
-  data.tar.gz: 2dbcb57bdfac12bea0e67c0da47b05a6f9cdc77415d14169820244f4c1ec3172ddc227e19a91f686ae39cc134394fbe11d82d66db9501a3ddbe5ee2b0b3fcba3
+  metadata.gz: b235456d07ee75d0c30ee8f0b1686d54113d7c936ac057af916238ffc6c9abd4d137dababe6d394a4b017934ad46ceb8d2575f73bf8622ea2a977c7e0304041c
+  data.tar.gz: 509f41552724c0cdaeb3e8213fa2ae4ac6a7a6b07e308ebe5bf535f4a02ca0003683ec3236d6d98d43fed4243e9c4df7b135a9c5179776f5ef56a77857a4368e

data/lib/chef_metal/convergence_strategy/install_cached.rb

@@ -16,7 +16,7 @@ module ChefMetal
         @package_cache = {}
         @tmp_dir = '/tmp'
         FileUtils.mkdir_p(@package_cache_path)
-        @download_lock = Mutex.new
+        @package_cache_lock = Mutex.new
       end
 
       def setup_convergence(provider, machine, machine_resource)
@@ -78,15 +78,22 @@ module ChefMetal
         metadata_url << "&p=#{platform}"
         metadata_url << "&pv=#{platform_version}"
         metadata_url << "&m=#{machine_architecture}"
+        use_ssl = true
 
         # solaris 9 lacks openssl, solaris 10 lacks recent enough credentials - your base O/S is completely insecure, please upgrade
         if platform == 'solaris2' && (platform_version == '5.9' || platform_version == '5.10')
           metadata_url.sub(/^https/, 'http')
+          use_ssl = false
         end
 
         # Download and parse the metadata
         Chef::Log.debug("Getting metadata for machine #{machine.node['name']}: #{metadata_url}")
-        metadata_str = Net::HTTP.get(URI(metadata_url))
+        uri = URI(metadata_url)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = use_ssl
+        request = Net::HTTP::Get.new(uri.request_uri)
+        response = http.request(request)
+        metadata_str = response.body
         metadata = {}
         metadata_str.each_line do |line|
           key, value = line.split("\t", 2)

data/lib/chef_metal/provisioner/fog_provisioner.rb

@@ -274,7 +274,7 @@ module ChefMetal
       end
 
       def symbolize_keys(options)
-        options.inject({}) { |result,key,value| result[key.to_sym] = value; result }
+        options.inject({}) { |result,(key,value)| result[key.to_sym] = value; result }
       end
 
       def server_for(node)

data/lib/chef_metal/version.rb

@@ -1,3 +1,3 @@
 module ChefMetal
-  VERSION = '0.3'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.1
 platform: ruby
 authors:
 - John Keiser