chef-metal 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c05f6095c83aebd085f44c69d10452e2f728a8f
-  data.tar.gz: 33ba5db04ce1618c3a7afd442c22a8274b99220c
+  metadata.gz: 793510893dd7adb4e0d2bfd54f22adab49e0fc15
+  data.tar.gz: 23cc9b99b247524ffb35769b1f4c107a0f9414d3
 SHA512:
-  metadata.gz: bbee9f82bd18b9b9742b405ba71cf06cbae8460e43776af454116cfd108cb44d7282360617f0e0e6802e06ccb3bb7b90f5d982a16049e3f61bed99ddba46e25d
-  data.tar.gz: 8f843e5e1c33c312e3e0d4131ea0d736846f5c7af18d766162521d7e106e2ead430e05b614d8ab7f71240580fc25dba2c4bbfe6ffae88472a7d13e325fb8ece2
+  metadata.gz: 6738450b250a9ec88c298d12166f7069fc79e4eea8bcab8c5a5d7a6f98ab77bfad43bc0ba85a57e8a8524f6a1bb26585c03dac2279d0d0d48a11f68b83f72aa0
+  data.tar.gz: 33f56df60eed263b8c49edbbeea700a551c219c11469eac9cb3c22405c004e6a1433a8793017a4b4381d313d15b15cd963c70c7e127ff9aaf84eeb682cd17187

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Chef Metal Changelog
 
+## 0.8.2 (4/9/2014)
+
+- Add timeout support to execute
+- Fix machine_file resource
+- Add ohai_hints DSL to machine resource (@xorl)
+
 ## 0.8.1 (4/9/2014)
 
 - Bug: error! was not raising an error in the SSH and WinRM transports

data/bin/metal

@@ -71,6 +71,11 @@ class ChefMetal::Application < Chef::Application
     :boolean      => true,
     :description  => "Whether to stream output from the machine (default: true)"
 
+  option :timeout,
+    :long         => "--timeout",
+    :default      => 15*60,
+    :description  => "Time to wait for program to execute, or 0 for no timeout (default: 15 minutes)"
+
   def reconfigure
     super
 
@@ -117,7 +122,7 @@ class ChefMetal::Application < Chef::Application
     when 'execute'
       each_machine(cli_arguments.shift) do |machine, provisioner|
         puts "[#{machine.node['name']}] running '#{cli_arguments.join(' ')}'"
-        result = machine.execute(action_handler, cli_arguments.join(' '), :read_only => config[:read_only], :stream => config[:stream])
+        result = machine.execute(action_handler, cli_arguments.join(' '), :read_only => config[:read_only], :stream => config[:stream], :timeout => config[:timeout])
         puts result.stdout if result.stdout != '' && !config[:stream] && Chef::Config.log_level != :debug
         STDERR.puts result.stderr if result.stderr != '' && !config[:stream] && Chef::Config.log_level != :debug
         exit_code = result.exitstatus if result.exitstatus != 0

data/lib/chef/provider/machine_file.rb

@@ -3,6 +3,8 @@ require 'cheffish/cheffish_server_api'
 
 class Chef::Provider::MachineFile < Chef::Provider::LWRPBase
 
+  include ChefMetal::ProviderActionHandler
+
   use_inline_resources
 
   def whyrun_supported?

data/lib/chef/resource/machine.rb

@@ -45,6 +45,10 @@ class Chef::Resource::Machine < Chef::Resource::LWRPBase
   attribute :admin, :kind_of => [TrueClass, FalseClass]
   attribute :validator, :kind_of => [TrueClass, FalseClass]
 
+  # Client Ohai hints, allows machine to enable hints
+  # e.g. ohai_hint 'ec2' => { 'a' => 'b' } creates file ec2.json with json contents { 'a': 'b' }
+  attribute :ohai_hints, :kind_of => Hash
+
   # Allows you to turn convergence off in the :create action by writing "converge false"
   # or force it with "true"
   attribute :converge, :kind_of => [TrueClass, FalseClass]

data/lib/chef_metal/convergence_strategy/precreate_chef_objects.rb

@@ -24,6 +24,9 @@ module ChefMetal
         chef_server_url = machine_resource.chef_server[:chef_server_url]
         chef_server_url = machine.make_url_available_to_remote(chef_server_url)
 
+        #Support for multiple ohai hints, required on some platforms
+        create_ohai_files(action_handler, machine, machine_resource)
+
         # Create client.rb and client.pem on machine
         content = client_rb_content(chef_server_url, machine.node['name'])
         machine.write_file(action_handler, client_rb_path, content, :ensure_dir => true)
@@ -103,6 +106,17 @@ module ChefMetal
         end
       end
 
+      # Create the ohai file(s)
+      def create_ohai_files(action_handler, machine, machine_resource)
+        if machine_resource.ohai_hints
+          machine_resource.ohai_hints.each_pair do |hint, data|
+            # The location of the ohai hint
+            ohai_hint = "/etc/chef/ohai/hints/#{hint}.json"
+            machine.write_file(action_handler, ohai_hint, data.to_json, :ensure_dir => true)
+          end
+        end
+      end
+
       def create_chef_objects(action_handler, machine, machine_resource, public_key)
         # Save the node and create the client keys and client.
         ChefMetal.inline_resource(action_handler) do

data/lib/chef_metal/machine/unix_machine.rb

@@ -56,7 +56,7 @@ module ChefMetal
       def create_dir(action_handler, path)
         if !file_exists?(path)
           action_handler.perform_action "create directory #{path} on #{node['name']}" do
-            transport.execute("mkdir #{path}").error!
+            transport.execute("mkdir -p #{path}").error!
           end
         end
       end

data/lib/chef_metal/transport.rb

@@ -1,5 +1,20 @@
+require 'timeout'
+
 module ChefMetal
   class Transport
+    DEFAULT_TIMEOUT = 15*60
+
+    # Execute a program on the remote host.
+    #
+    # == Arguments
+    # command: command to run.  May be a shell-escaped string or a pre-split array containing [PROGRAM, ARG1, ARG2, ...].
+    # options: hash of options, including but not limited to:
+    #          :timeout => NUM_SECONDS - time to wait before program finishes (throws an exception otherwise).  Set to nil or 0 to run with no timeout.  Defaults to 15 minutes.
+    #          :stream => BOOLEAN - true to stream stdout and stderr to the console.
+    #          :stream => BLOCK - block to stream stdout and stderr to (block.call(stdout_chunk, stderr_chunk))
+    #          :stream_stdout => FD - FD to stream stdout to (defaults to IO.stdout)
+    #          :stream_stderr => FD - FD to stream stderr to (defaults to IO.stderr)
+    #          :read_only => BOOLEAN - true if command is guaranteed not to change system state (useful for Docker)
     def execute(command, options = {})
       raise "execute not overridden on #{self.class}"
     end
@@ -55,5 +70,13 @@ module ChefMetal
         end
       end
     end
+
+    def with_execute_timeout(options, &block)
+      Timeout::timeout(execute_timeout(options), &block)
+    end
+
+    def execute_timeout(options)
+      options.has_key?(:timeout) ? options[:timeout] : DEFAULT_TIMEOUT
+    end
   end
 end

data/lib/chef_metal/transport/ssh.rb

@@ -1,6 +1,7 @@
 require 'chef_metal/transport'
 require 'uri'
 require 'socket'
+require 'timeout'
 
 module ChefMetal
   class Transport
@@ -32,7 +33,6 @@ module ChefMetal
             end
           end
 
-
           channel.exec("#{options[:prefix]}#{command}") do |ch, success|
             raise "could not execute command: #{command.inspect}" unless success
 
@@ -52,11 +52,13 @@ module ChefMetal
           end
         end
 
-        channel.wait
+        with_execute_timeout(execute_options) do
+          channel.wait
+        end
 
         Chef::Log.info("Completed #{command} on #{username}@#{host}: exit status #{exitstatus}")
-        Chef::Log.debug("Stdout was:\n#{stdout}") if stdout != '' && !options[:stream] && !options[:stream_stdout]
-        Chef::Log.info("Stderr was:\n#{stderr}") if stderr != '' && !options[:stream] && !options[:stream_stderr]
+        Chef::Log.debug("Stdout was:\n#{stdout}") if stdout != '' && !options[:stream] && !options[:stream_stdout] && Chef::Config.log_level != :debug
+        Chef::Log.info("Stderr was:\n#{stderr}") if stderr != '' && !options[:stream] && !options[:stream_stderr] && Chef::Config.log_level != :debug
         SSHResult.new(command, execute_options, stdout, stderr, exitstatus)
       end
 

data/lib/chef_metal/transport/winrm.rb

@@ -1,5 +1,6 @@
 require 'chef_metal/transport'
 require 'base64'
+require 'timeout'
 
 module ChefMetal
   class Transport
@@ -15,8 +16,10 @@ module ChefMetal
       attr_reader :options
 
       def execute(command, execute_options = {})
-        output = session.run_powershell_script(command) do |stdout, stderr|
-          stream_chunk(execute_options, stdout, stderr)
+        output = with_execute_timeout(execute_options) do
+          session.run_powershell_script(command) do |stdout, stderr|
+            stream_chunk(execute_options, stdout, stderr)
+          end
         end
         WinRMResult.new(command, execute_options, output)
       end

data/lib/chef_metal/version.rb

@@ -1,3 +1,3 @@
 module ChefMetal
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

metadata

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