chef-metal 0.11.beta.4 → 0.11.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deec69f3616cfbff829b76545fc7c85de4d2f2c9
-  data.tar.gz: 0e60cbb1b3676930193f72b25c95efe8ca83e437
+  metadata.gz: 64ea86f29c6071ee79f33641c14a1f789cfcd332
+  data.tar.gz: 26b76360f2199924897ce4e86e68be5fd21dff0e
 SHA512:
-  metadata.gz: 5ad2143eda51d06ef8b116bb59b512e77b60db04a46f3e10c122e636a49798cba0f661877c9ec61bcedaebb8f35f22fe1021cf00cc5c9110b007e2b63b688c48
-  data.tar.gz: 87852ac0f52c21e801cb49bfb82386cd61180ab39fc2047fdfd67aabc3fc8ac8df2dd3ded37bdfecc282919bb057bb6c5ac0409d1198a8aed87de2671a802e62
+  metadata.gz: 6fc3b908d5393e2729fee78d50a9edf1f561748c93a4336b871fafa22f17898b50b3248dee66a7350399631c95de2c9431562352d67fc8267d47a68271196501
+  data.tar.gz: b6e096f975a6807a2ecb313ba8de45c4611aea368ebf84004ed3ba14257025f75f5ce4b302317a98ac2c7275aa032295d74983e5786cb563bbab8eb502c64b56

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Chef Metal Changelog
 
+## 0.11.beta.5 (5/28/2014)
+
+- fix issue setting Hosted Chef ACLs on nodes
+- fix single-machine converge crash
+
 ## 0.11.beta.2 (5/27/2014)
 
 - Bring in cheffish-0.5.beta.2

data/lib/chef/provider/machine.rb

@@ -25,6 +25,7 @@ class Chef::Provider::Machine < Chef::Provider::LWRPBase
     action_allocate
     machine = current_driver.ready_machine(action_handler, machine_spec, machine_options)
     machine_spec.save(action_handler)
+    machine
   end
 
   action :setup do

data/lib/chef_metal/convergence_strategy/install_cached.rb

@@ -19,9 +19,11 @@ module ChefMetal
       # - :client_rb_path, :client_pem_path
       # - :chef_version, :prerelease, :package_cache_path
       def initialize(convergence_options, config)
-        super
-        @convergence_options[:client_rb_path] ||= '/etc/chef/client.rb'
-        @convergence_options[:client_pem_path] ||= '/etc/chef/client.pem'
+        convergence_options = Cheffish::MergedConfig.new(convergence_options, {
+          :client_rb_path => '/etc/chef/client.rb',
+          :client_pem_path => '/etc/chef/client.pem'
+        })
+        super(convergence_options, config)
         @chef_version ||= convergence_options[:chef_version]
         @prerelease ||= convergence_options[:prerelease]
         @package_cache_path ||= convergence_options[:package_cache_path] || "#{ENV['HOME']}/.chef/package_cache"
@@ -32,6 +34,9 @@ module ChefMetal
         @package_cache_lock = Mutex.new
       end
 
+      attr_reader :client_rb_path
+      attr_reader :client_pem_path
+
       def setup_convergence(action_handler, machine)
         super
 
@@ -51,8 +56,8 @@ module ChefMetal
         action_handler.open_stream(machine.node['name']) do |stdout|
           action_handler.open_stream(machine.node['name']) do |stderr|
             command_line = "chef-client"
-            command_line << "-l #{config[:log_level].to_s}" if config[:log_level]
-            machine.execute(action_handler, "chef-client",
+            command_line << " -l #{config[:log_level].to_s}" if config[:log_level]
+            machine.execute(action_handler, command_line,
               :stream_stdout => stdout,
               :stream_stderr => stderr,
               :timeout => @chef_client_timeout)

data/lib/chef_metal/convergence_strategy/install_msi.rb

@@ -7,6 +7,7 @@ module ChefMetal
       @@install_msi_cache = {}
 
       def initialize(convergence_options, config)
+        super
         @install_msi_url = convergence_options[:install_msi_url] || 'http://www.opscode.com/chef/install.msi'
         @install_msi_path = convergence_options[:install_msi_path] || "%TEMP%\\#{File.basename(@install_msi_url)}"
         @chef_client_timeout = convergence_options.has_key?(:chef_client_timeout) ? convergence_options[:chef_client_timeout] : 120*60 # Default: 2 hours
@@ -16,15 +17,19 @@ module ChefMetal
       attr_reader :install_msi_path
 
       def setup_convergence(action_handler, machine)
-        system_drive = machine.execute_always('$env:SystemDrive').stdout.strip
-        convergence_options[:client_rb_path] ||= "#{system_drive}\\chef\\client.rb"
-        convergence_options[:client_pem_path] ||= "#{system_drive}\\chef\\client.pem"
+        if !convergence_options.has_key?(:client_rb_path) || !convergence_options.has_key?(:client_pem_path)
+          system_drive = machine.execute_always('$env:SystemDrive').stdout.strip
+          @convergence_options = Cheffish::MergedConfig.new(convergence_options, {
+            :client_rb_path => "#{system_drive}\\chef\\client.rb",
+            :client_pem_path => "#{system_drive}\\chef\\client.pem"
+          })
+        end
 
         super
 
         # Install chef-client.  TODO check and update version if not latest / not desired
         if machine.execute_always('chef-client -v').exitstatus != 0
-          # TODO ssh verification of install.sh before running arbtrary code would be nice?
+          # TODO ssh verification of install.msi before running arbtrary code would be nice?
           # TODO find a way to cache this on the host like with the Unix stuff.
           # Limiter is we don't know how to efficiently upload large files to
           # the remote machine with WMI.

data/lib/chef_metal/convergence_strategy/install_sh.rb

@@ -7,11 +7,13 @@ module ChefMetal
       @@install_sh_cache = {}
 
       def initialize(convergence_options, config)
-        super
+        convergence_options = Cheffish::MergedConfig.new(convergence_options, {
+          :client_rb_path => '/etc/chef/client.rb',
+          :client_pem_path => '/etc/chef/client.pem'
+        })
+        super(convergence_options, config)
         @install_sh_url = convergence_options[:install_sh_url] || 'http://www.opscode.com/chef/install.sh'
         @install_sh_path = convergence_options[:install_sh_path] || '/tmp/chef-install.sh'
-        @convergence_options[:client_rb_path] ||= '/etc/chef/client.rb'
-        @convergence_options[:client_pem_path] ||= '/etc/chef/client.pem'
         @chef_client_timeout = convergence_options.has_key?(:chef_client_timeout) ? convergence_options[:chef_client_timeout] : 120*60 # Default: 2 hours
       end
 
@@ -36,7 +38,7 @@ module ChefMetal
         action_handler.open_stream(machine.node['name']) do |stdout|
           action_handler.open_stream(machine.node['name']) do |stderr|
             command_line = "chef-client"
-            command_line << "-l #{config[:log_level].to_s}" if config[:log_level]
+            command_line << " -l #{config[:log_level].to_s}" if config[:log_level]
             machine.execute(action_handler, command_line,
               :stream_stdout => stdout,
               :stream_stderr => stderr,

data/lib/chef_metal/convergence_strategy/precreate_chef_objects.rb

@@ -149,18 +149,22 @@ module ChefMetal
 
         # If using enterprise/hosted chef, fix acls
         if chef_server[:chef_server_url] =~ /\/+organizations\/.+/
-          grant_client_node_permissions(chef_server, machine.name, ["read", "update"])
+          grant_client_node_permissions(action_handler, chef_server, machine.name, ["read", "update"])
         end
       end
 
       # Grant the client permissions to the node
       # This procedure assumes that the client name and node name are the same
-      def grant_client_node_permissions(chef_server, node_name, perms)
-        rest = Chef::REST.new(chef_server[:chef_server_url])
-        node_perms = rest.get("/nodes/#{node_name}/_acl")
+      def grant_client_node_permissions(action_handler, chef_server, node_name, perms)
+        api = Cheffish.chef_server_api(chef_server)
+        node_perms = api.get("/nodes/#{node_name}/_acl")
         perms.each do |p|
-          node_perms[p]['actors'] << node_name unless node_perms[p]['actors'].include?(node_name)
-          rest.put("/nodes/#{node_name}/_acl/#{p}", p => node_perms[p])
+          if !node_perms[p]['actors'].include?(node_name)
+            action_handler.perform_action "Add #{node_name} to client #{p} ACLs" do
+              node_perms[p]['actors'] << node_name
+              api.put("/nodes/#{node_name}/_acl/#{p}", p => node_perms[p])
+            end
+          end
         end
       end
 

data/lib/chef_metal/version.rb

@@ -1,3 +1,3 @@
 module ChefMetal
-  VERSION = '0.11.beta.4'
+  VERSION = '0.11.beta.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal
 version: !ruby/object:Gem::Version
-  version: 0.11.beta.4
+  version: 0.11.beta.5
 platform: ruby
 authors:
 - John Keiser
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.beta.2
+        version: 0.5.beta.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.beta.2
+        version: 0.5.beta.3
 - !ruby/object:Gem::Dependency
   name: chef-metal-fog
   requirement: !ruby/object:Gem::Requirement