chef-metal 0.10.2 → 0.11.beta

data/lib/chef_metal/machine/windows_machine.rb

@@ -3,7 +3,7 @@ require 'chef_metal/machine/basic_machine'
 module ChefMetal
   class Machine
     class WindowsMachine < BasicMachine
-      def initialize(node, transport, convergence_strategy)
+      def initialize(machine_spec, transport, convergence_strategy)
         super
       end
 
@@ -15,7 +15,7 @@ module ChefMetal
       # Delete file
       def delete_file(action_handler, path)
         if file_exists?(path)
-          action_handler.perform_action "delete file #{escape(path)} on #{node['name']}" do
+          action_handler.perform_action "delete file #{escape(path)} on #{machine_spec.name}" do
             transport.execute("Remove-Item #{escape(path)}").error!
           end
         end
@@ -68,7 +68,7 @@ EOM
 
       def create_dir(action_handler, path)
         if !file_exists?(path)
-          action_handler.perform_action "create directory #{path} on #{node['name']}" do
+          action_handler.perform_action "create directory #{path} on #{machine_spec.name}" do
             transport.execute("New-Item #{escape(path)} -Type directory")
           end
         end

data/lib/chef_metal/machine_spec.rb

@@ -1,43 +1,36 @@
-require 'cheffish'
-require 'cheffish/cheffish_server_api'
-
 module ChefMetal
   #
   # Specification for a machine. Sufficient information to find and contact it
   # after it has been set up.
   #
   class MachineSpec
-    def initialize(node, chef_server)
+    def initialize(node)
       @node = node
-      @chef_server = chef_server
     end
 
-    def self.get(name, chef_server)
-      rest = Cheffish::CheffishServerAPI.new(chef_server || Cheffish.current_chef_server)
-      MachineSpec.new(rest.get("/nodes/#{name}"), chef_server)
-    end
+    attr_reader :node
 
     #
     # Globally unique identifier for this machine. Does not depend on the machine's
     # location or existence.
     #
     def id
-      "#{@chef_server[:chef_server_url]}/nodes/#{name}"
+      raise "id unimplemented"
     end
 
     #
     # Name of the machine. Corresponds to the name in "machine 'name' do" ...
     #
     def name
-      @node['name']
+      node['name']
     end
 
     #
     # Location of this machine. This should be a freeform hash, with enough
-    # information for the provider to look it up and create a Machine object to
+    # information for the driver to look it up and create a Machine object to
     # access it.
     #
-    # This MUST include a 'provider_url' attribute with the provider's URL in it.
+    # This MUST include a 'driver_url' attribute with the driver's URL in it.
     #
     # chef-metal will do its darnedest to not lose this information.
     #
@@ -49,8 +42,12 @@ module ChefMetal
     # Set the location for this machine.
     #
     def location=(value)
-      @node['normal']['metal'] ||= {}
-      @node['normal']['metal']['spec'] = value
+      set_metal_attr('location', value)
+    end
+
+    # URL to the driver.  Convenience for location['driver_url']
+    def driver_url
+      location ? location['driver_url'] : nil
     end
 
     #
@@ -59,23 +56,23 @@ module ChefMetal
     # saved automatically for you after allocate_machine and ready_machine.
     #
     def save(action_handler)
-      # Save the node to the server.
-      ChefMetal.inline_resource(action_handler) do
-        chef_node node['name'] do
-          chef_server @chef_server
-          raw_json node
-        end
-      end
+      raise "save unimplemented"
     end
 
-    private
+    protected
 
     def metal_attr(attr)
-      if @node['normal'] && @node['normal']['metal']
-        @node['normal']['metal'][attr]
+      if node['normal'] && node['normal']['metal']
+        node['normal']['metal'][attr]
       else
         nil
       end
     end
+
+    def set_metal_attr(attr, value)
+      node['normal'] ||= {}
+      node['normal']['metal'] ||= {}
+      node['normal']['metal'][attr] = value
+    end
   end
 end

data/lib/chef_metal/recipe_dsl.rb

@@ -1,15 +1,24 @@
 require 'chef_metal/chef_run_data'
 require 'chef/resource_collection'
 
+require 'chef/resource/machine'
+require 'chef/provider/machine'
+require 'chef/resource/machine_batch'
+require 'chef/provider/machine_batch'
+require 'chef/resource/machine_file'
+require 'chef/provider/machine_file'
+require 'chef/resource/machine_execute'
+require 'chef/provider/machine_execute'
+
 class Chef
   module DSL
     module Recipe
-      def with_provisioner(provisioner, &block)
-        run_context.chef_metal.with_provisioner(provisioner, &block)
+      def with_driver(driver, &block)
+        run_context.chef_metal.with_driver(driver, &block)
       end
 
-      def with_provisioner_options(provisioner_options, &block)
-        run_context.chef_metal.with_provisioner_options(provisioner_options, &block)
+      def with_machine_options(machine_options, &block)
+        run_context.chef_metal.with_machine_options(machine_options, &block)
       end
 
       def with_machine_batch(the_machine_batch, options = {}, &block)
@@ -26,12 +35,12 @@ class Chef
         run_context.chef_metal.with_machine_batch(the_machine_batch, &block)
       end
 
-      def current_provisioner_options
-        run_context.chef_metal.current_provisioner_options
+      def current_machine_options
+        run_context.chef_metal.current_machine_options
       end
 
-      def add_provisioner_options(options, &block)
-        run_context.chef_metal.add_provisioner_options(options, &block)
+      def add_machine_options(options, &block)
+        run_context.chef_metal.add_machine_options(options, &block)
       end
 
       # When the machine resource is first declared, create a machine_batch (if there
@@ -45,9 +54,25 @@ class Chef
     end
   end
 
+  class Config
+    default(:driver) { ENV['CHEF_DRIVER'] }
+  #   config_context :drivers do
+  #     # each key is a driver_url, and each value can have driver, driver_options and machine_options
+  #     config_strict_mode false
+  #   end
+  #   config_context :driver_options do
+  #     # open ended for whatever the driver wants
+  #     config_strict_mode false
+  #   end
+  #   config_context :machine_options do
+  #     # open ended for whatever the driver wants
+  #     config_strict_mode false
+  #   end
+  end
+
   class RunContext
     def chef_metal
-      @chef_metal ||= ChefMetal::ChefRunData.new
+      @chef_metal ||= ChefMetal::ChefRunData.new(config)
     end
   end
 end

data/lib/chef_metal/transport.rb

@@ -47,6 +47,11 @@ module ChefMetal
       raise "available? not overridden on #{self.class}"
     end
 
+    # Config hash, including :log_level and :logger as keys
+    def config
+      raise "config not overridden on #{self.class}"
+    end
+
     protected
 
     # Helper to implement stdout/stderr streaming in execute
@@ -57,14 +62,14 @@ module ChefMetal
         if stdout_chunk
           if options[:stream_stdout]
             options[:stream_stdout].print stdout_chunk
-          elsif options[:stream] || Chef::Config.log_level == :debug
+          elsif options[:stream] || config[:log_level] == :debug
             STDOUT.print stdout_chunk
           end
         end
         if stderr_chunk
           if options[:stream_stderr]
             options[:stream_stderr].print stderr_chunk
-          elsif options[:stream] || Chef::Config.log_level == :debug
+          elsif options[:stream] || config[:log_level] == :debug
             STDERR.print stderr_chunk
           end
         end

data/lib/chef_metal/transport/ssh.rb

@@ -2,23 +2,26 @@ require 'chef_metal/transport'
 require 'uri'
 require 'socket'
 require 'timeout'
+require 'net/ssh'
+require 'net/scp'
+require 'net/ssh/gateway'
 
 module ChefMetal
   class Transport
     class SSH < ChefMetal::Transport
-      def initialize(host, username, ssh_options, options)
-        require 'net/ssh'
-        require 'net/scp'
+      def initialize(host, username, ssh_options, options, global_config)
         @host = host
         @username = username
         @ssh_options = ssh_options
         @options = options
+        @config = global_config
       end
 
       attr_reader :host
       attr_reader :username
       attr_reader :ssh_options
       attr_reader :options
+      attr_reader :config
 
       def execute(command, execute_options = {})
         Chef::Log.info("Executing #{options[:prefix]}#{command} on #{username}@#{host}")
@@ -58,8 +61,8 @@ module ChefMetal
         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::Config.log_level != :debug
-        Chef::Log.info("Stderr was:\n#{stderr}") if stderr != '' && !options[:stream] && !options[:stream_stderr] && Chef::Config.log_level != :debug
+        Chef::Log.debug("Stdout was:\n#{stdout}") if stdout != '' && !options[:stream] && !options[:stream_stdout] && config[:log_level] != :debug
+        Chef::Log.info("Stderr was:\n#{stderr}") if stderr != '' && !options[:stream] && !options[:stream_stderr] && config[:log_level] != :debug
         SSHResult.new(command, execute_options, stdout, stderr, exitstatus)
       end
 
@@ -131,20 +134,50 @@ module ChefMetal
         # If you can't pwd within 10 seconds, you can't pwd
         execute('pwd', :timeout => 10)
         true
-      rescue Timeout::Error, Errno::EHOSTUNREACH, Errno::ETIMEDOUT, Errno::ECONNREFUSED, Errno::ECONNRESET, Net::SSH::AuthenticationFailed, Net::SSH::Disconnect, Net::SSH::HostKeyMismatch
-        Chef::Log.debug("#{username}@#{host} unavailable: could not execute 'pwd' on #{host}: #{$!.inspect}")
+      rescue Timeout::Error, Errno::EHOSTUNREACH, Errno::ETIMEDOUT, Errno::ECONNREFUSED, Errno::ECONNRESET, Net::SSH::Disconnect
+        Chef::Log.debug("#{username}@#{host} unavailable: network connection failed or broke: #{$!.inspect}")
+        false
+      rescue Net::SSH::AuthenticationFailed, Net::SSH::HostKeyMismatch
+        Chef::Log.debug("#{username}@#{host} unavailable: SSH authentication error: #{$!.inspect} ")
         false
       end
 
       protected
 
+      def gateway?
+        options.key?(:ssh_gateway) and ! options[:ssh_gateway].nil?
+      end
+
+      def gateway
+        @gateway ||= begin
+          gw_host, gw_user = options[:ssh_gateway].split('@').reverse
+          gw_host, gw_port = gw_host.split(':')
+          gw_user = ssh_options[:ssh_username] unless gw_user
+
+          ssh_start_opts = { timeout:10 }.merge(ssh_options)
+          ssh_start_opts[:port] = gw_port || 22
+
+          Chef::Log.debug("Opening SSH gateway to #{gw_user}@#{gw_host} with options #{ssh_start_opts.inspect}")
+          begin
+            Net::SSH::Gateway.new(gw_host, gw_user)
+          rescue Errno::ETIMEDOUT
+            Chef::Log.debug("Timed out connecting to gateway: #{$!}")
+            raise InitialConnectTimeout.new($!)
+          end
+        end
+      end
+
       def session
         @session ||= begin
-          Chef::Log.debug("Opening SSH connection to #{username}@#{host} with options #{ssh_options.inspect}")
+          ssh_start_opts = { timeout:10 }.merge(ssh_options)
+          Chef::Log.debug("Opening SSH connection to #{username}@#{host} with options #{ssh_start_opts.inspect}")
           # Small initial connection timeout (10s) to help us fail faster when server is just dead
           begin
-            Net::SSH.start(host, username, { :timeout => 10 }.merge(ssh_options))
+            if gateway? then gateway.ssh(host, username, ssh_start_opts)
+            else Net::SSH.start(host, username, ssh_start_opts)
+            end
           rescue Timeout::Error
+            Chef::Log.debug("Timed out connecting to SSH: #{$!}")
             raise InitialConnectTimeout.new($!)
           end
         end

data/lib/chef_metal/transport/winrm.rb

@@ -5,15 +5,17 @@ require 'timeout'
 module ChefMetal
   class Transport
     class WinRM < ChefMetal::Transport
-      def initialize(endpoint, type, options = {})
+      def initialize(endpoint, type, options, global_config)
         @endpoint = endpoint
         @type = type
         @options = options
+        @config = global_config
       end
 
       attr_reader :endpoint
       attr_reader :type
       attr_reader :options
+      attr_reader :config
 
       def execute(command, execute_options = {})
         output = with_execute_timeout(execute_options) do
@@ -21,7 +23,7 @@ module ChefMetal
             stream_chunk(execute_options, stdout, stderr)
           end
         end
-        WinRMResult.new(command, execute_options, output)
+        WinRMResult.new(command, execute_options, config, output)
       end
 
       def read_file(path)
@@ -74,9 +76,10 @@ $file.Close
       end
 
       class WinRMResult
-        def initialize(command, options, output)
+        def initialize(command, options, config, output)
           @command = command
           @options = options
+          @config = config
           @exitstatus = output[:exitcode]
           @stdout = ''
           @stderr = ''
@@ -95,8 +98,8 @@ $file.Close
         def error!
           if exitstatus != 0
             msg = "Error: command '#{command}' exited with code #{exitstatus}.\n"
-            msg << "STDOUT: #{stdout}" if !options[:stream] && !options[:stream_stdout] && Chef::Config.log_level != :debug
-            msg << "STDERR: #{stderr}" if !options[:stream] && !options[:stream_stderr] && Chef::Config.log_level != :debug
+            msg << "STDOUT: #{stdout}" if !options[:stream] && !options[:stream_stdout] && config[:log_level] != :debug
+            msg << "STDERR: #{stderr}" if !options[:stream] && !options[:stream_stderr] && config[:log_level] != :debug
             raise msg
           end
         end

data/lib/chef_metal/version.rb

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

data/spec/integration/machine.rb

@@ -0,0 +1,29 @@
+describe Chef::Resource::Machine do
+  # With Properties
+  #
+  # with_driver
+  # machine.driver
+  # no driver
+  # with_machine_options
+  # machine.machine_options
+  # no machine_options
+  #
+  # node tests
+  # machine with_environment
+  # machine.environment
+  # no environment
+  # machine with_chef_server
+  # machine.chef_server
+  # no chef_server
+  # all node attributes
+  # attributes overwrites normal attributes, but not attributes
+  #
+  # client tests
+  # different private key generation options
+  # pass in private / public key
+  #
+  # Actions
+  context 'with a recipe that ' do
+    with_recipe do
+      machine 'blah'
+    end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.beta
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -52,6 +52,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: net-ssh-gateway
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
@@ -160,7 +174,8 @@ files:
 - lib/chef/resource/machine_file.rb
 - lib/chef_metal/action_handler.rb
 - lib/chef_metal/add_prefix_action_handler.rb
-- lib/chef_metal/aws_credentials.rb
+- lib/chef_metal/chef_machine_spec.rb
+- lib/chef_metal/chef_provider_action_handler.rb
 - lib/chef_metal/chef_run_data.rb
 - lib/chef_metal/convergence_strategy/install_cached.rb
 - lib/chef_metal/convergence_strategy/install_msi.rb
@@ -168,15 +183,12 @@ files:
 - lib/chef_metal/convergence_strategy/no_converge.rb
 - lib/chef_metal/convergence_strategy/precreate_chef_objects.rb
 - lib/chef_metal/convergence_strategy.rb
+- lib/chef_metal/driver.rb
 - lib/chef_metal/machine/basic_machine.rb
 - lib/chef_metal/machine/unix_machine.rb
 - lib/chef_metal/machine/windows_machine.rb
 - lib/chef_metal/machine.rb
 - lib/chef_metal/machine_spec.rb
-- lib/chef_metal/openstack_credentials.rb
-- lib/chef_metal/provider.rb
-- lib/chef_metal/provider_action_handler.rb
-- lib/chef_metal/provisioner.rb
 - lib/chef_metal/recipe_dsl.rb
 - lib/chef_metal/transport/ssh.rb
 - lib/chef_metal/transport/winrm.rb
@@ -199,9 +211,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3