chef-metal 0.11.beta.6 → 0.11.beta.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57e203c5e2a58d054e8d303906e5b40d2478ed37
-  data.tar.gz: 0b8b3b991467d7d834f546f5f43deea6d2082698
+  metadata.gz: 5295f868cdb91eb708ae603119f352c45d3ef5fe
+  data.tar.gz: fdfde295e6a4085a79052dd4546804263f29b23e
 SHA512:
-  metadata.gz: 6e53205b1f8a91b810aac8f45f830194d2a9b6012351d64f7cb51d2da219f71d5aa1cb5a534d710bbaf7a7a2a98041d38dd843149eebd3927e97366a61e70440
-  data.tar.gz: bfc2fbef95fc8c9692d48621fe4aefb353422742350c79e49a5386af627dfc7aba41140d589f250916abf7c6fd6a290b3fc92b9da56fdce620ab5bf8c0301234
+  metadata.gz: b866ac1631345db40f2a8847e7a642dd25e71f6812e5e03c69fa2c24a11ded94cd2252593a2132ab512ca1e0366716809b94d02a94a9e819d077aa518761ff66
+  data.tar.gz: 5054683877ed189a7617d543e8aee69862ee19b8cb0fa7b3779da00a9281d3dfd92c31393f5d54a2d4ec066fe107b87bde48fdf303682179042d114cdeaf4365

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Chef Metal Changelog
 
+## 0.11.beta.7 (5/30/2014)
+
+- fix machine_batch error report to be less verbose
+- allow options to be set from with_driver
+- fail when machine is being moved from driver to driver
+- support knife.rb config for non-canonical URLs
+- @marcusn disconnect from SSH when there is a problem
+
 ## 0.11.beta.6 (5/28/2014)
 
 - Fix machine_batch defaults to be significantly less stupid

data/README.md

@@ -5,6 +5,10 @@ This library solves the problem of repeatably creating machines and infrastructu
 
 Currently, chef-metal supports vagrant, Unixes/ssh, and Windows/winrm with real chef-servers or with automagical chef-zero tunneling.  Fog and Docker support (to cover EC2 and LXC) are next up.  Further out, we'd like to extend support to image factories (using the machine resource to produce images) and PXE support.
 
+A NOTE: the upcoming 0.11 has multiple changes and this document is not yet up to date with respect to them.  For guides to writing drivers, embedding drivers and configuring Chef Metal, start here:
+
+[Chef Metal, Configuration and Drivers](https://github.com/opscode/chef-metal/blob/master/docs/blogs/2012-05-22-new-driver-interface.html.markdown#chef-metal-configuration-and-drivers)
+
 Try It Out
 ----------
 

data/lib/chef/provider/machine.rb

@@ -17,13 +17,16 @@ class Chef::Provider::Machine < Chef::Provider::LWRPBase
   end
 
   action :allocate do
-    new_driver.allocate_machine(action_handler, machine_spec, machine_options)
+    if current_driver && current_driver.driver_url != new_driver.driver_url
+      raise "Cannot move '#{machine_spec.name}' from #{current_driver.driver_url} to #{new_driver.driver_url}: machine moving is not supported.  Destroy and recreate."
+    end
+    new_driver.allocate_machine(action_handler, machine_spec, new_machine_options)
     machine_spec.save(action_handler)
   end
 
   action :ready do
     action_allocate
-    machine = current_driver.ready_machine(action_handler, machine_spec, machine_options)
+    machine = current_driver.ready_machine(action_handler, machine_spec, current_machine_options)
     machine_spec.save(action_handler)
     machine
   end
@@ -56,7 +59,7 @@ class Chef::Provider::Machine < Chef::Provider::LWRPBase
   end
 
   action :converge_only do
-    machine = run_context.chef_metal.connect_to_machine(machine_spec, machine_options)
+    machine = run_context.chef_metal.connect_to_machine(machine_spec, current_machine_options)
     begin
       machine.converge(action_handler)
     ensure
@@ -66,33 +69,39 @@ class Chef::Provider::Machine < Chef::Provider::LWRPBase
 
   action :stop do
     if current_driver
-      current_driver.stop_machine(action_handler, machine_spec, machine_options)
+      current_driver.stop_machine(action_handler, machine_spec, current_machine_options)
     end
   end
 
   action :destroy do
     if current_driver
-      current_driver.destroy_machine(action_handler, machine_spec, machine_options)
+      current_driver.destroy_machine(action_handler, machine_spec, current_machine_options)
     end
   end
 
+  attr_reader :machine_spec
+
   def new_driver
     run_context.chef_metal.driver_for(new_resource.driver)
   end
 
-  def new_driver_config
-    run_context.chef_metal.driver_config_for(new_resource.driver)
-  end
-
   def current_driver
     if machine_spec.driver_url
-      run_context.chef_metal.driver_for_url(machine_spec.driver_url)
+      run_context.chef_metal.driver_for(machine_spec.driver_url)
     end
   end
 
-  attr_reader :machine_spec
+  def new_machine_options
+    machine_options(new_driver)
+  end
+
+  def current_machine_options
+    if current_driver
+      machine_options(current_driver)
+    end
+  end
 
-  def machine_options
+  def machine_options(driver)
     configs = []
     configs << {
       :convergence_options =>
@@ -109,7 +118,7 @@ class Chef::Provider::Machine < Chef::Provider::LWRPBase
         end
     }
     configs << new_resource.machine_options if new_resource.machine_options
-    configs << new_driver_config[:machine_options] if new_driver_config[:machine_options]
+    configs << driver.config[:machine_options] if driver.config[:machine_options]
     Cheffish::MergedConfig.new(*configs)
   end
 

data/lib/chef/provider/machine_batch.rb

@@ -12,6 +12,33 @@ class Chef::Provider::MachineBatch < Chef::Provider::LWRPBase
     @action_handler ||= ChefMetal::ChefProviderActionHandler.new(self)
   end
 
+  # We override this because we want to hide @from_recipe
+  def to_text
+    ivars = instance_variables.map { |ivar| ivar.to_sym } - HIDDEN_IVARS - [ :@from_recipe, :@machines ]
+    text = "# Declared in #{@source_line}\n\n"
+    text << self.class.dsl_name + "(\"#{name}\") do\n"
+    ivars.each do |ivar|
+      if (value = instance_variable_get(ivar)) && !(value.respond_to?(:empty?) && value.empty?)
+        value_string = value.respond_to?(:to_text) ? value.to_text : value.inspect
+        text << "  #{ivar.to_s.sub(/^@/,'')} #{value_string}\n"
+      end
+    end
+    machine_names = @machines.map do |m|
+      if m.is_a?(ChefMetal::MachineSpec)
+        m.name
+      elsif m.is_a?(Chef::Resource::Machine)
+        m.name
+      else
+        m
+      end
+    end
+    text << "  machines #{machine_names.inspect}"
+    [@not_if, @only_if].flatten.each do |conditional|
+      text << "  #{conditional.to_text}\n"
+    end
+    text << "end\n"
+  end
+
   use_inline_resources
 
   def whyrun_supported?
@@ -101,11 +128,22 @@ class Chef::Provider::MachineBatch < Chef::Provider::LWRPBase
 
   def by_new_driver
     result = {}
+    drivers = {}
     @machines.each do |m|
       if m[:desired_driver]
-        driver = run_context.chef_metal.driver_for(m[:desired_driver])
+        drivers[m[:desired_driver]] ||= run_context.chef_metal.driver_for(m[:desired_driver])
+        driver = drivers[m[:desired_driver]]
+        # Check whether the current driver is same or different; we disallow
+        # moving a machine from one place to another.
+        if m[:spec].driver_url
+          drivers[m[:spec].driver_url] ||= run_context.chef_metal.driver_for(m[:spec].driver_url)
+          current_driver = drivers[m[:spec].driver_url]
+          if driver.driver_url != current_driver.driver_url
+            raise "Cannot move '#{m[:spec].name}' from #{current_driver.driver_url} to #{driver.driver_url}: machine moving is not supported.  Destroy and recreate."
+          end
+        end
         result[driver] ||= {}
-        result[driver][m[:spec]] = m[:options]
+        result[driver][m[:spec]] = m[:machine_options].call(driver)
       end
     end
     result
@@ -113,11 +151,13 @@ class Chef::Provider::MachineBatch < Chef::Provider::LWRPBase
 
   def by_current_driver
     result = {}
+    drivers = {}
     @machines.each do |m|
       if m[:spec].driver_url
-        driver = run_context.chef_metal.driver_for_url(m[:spec].driver_url)
+        drivers[m[:spec].driver_url] ||= run_context.chef_metal.driver_for(m[:spec].driver_url)
+        driver = drivers[m[:spec].driver_url]
         result[driver] ||= {}
-        result[driver][m[:spec]] = m[:options]
+        result[driver][m[:spec]] = m[:machine_options].call(driver)
       end
     end
     result
@@ -134,7 +174,7 @@ class Chef::Provider::MachineBatch < Chef::Provider::LWRPBase
           :spec => provider.machine_spec,
           :desired_driver => machine_resource.driver,
           :files => machine_resource.files,
-          :options => provider.machine_options
+          :machine_options => proc { |driver| provider.machine_options(driver) }
         }
       elsif machine.is_a?(ChefMetal::MachineSpec)
         machine_spec = machine
@@ -142,7 +182,7 @@ class Chef::Provider::MachineBatch < Chef::Provider::LWRPBase
           :spec => machine_spec,
           :desired_driver => new_resource.driver,
           :files => new_resource.files,
-          :options => new_machine_options
+          :machine_options => proc { |driver| machine_options(driver) }
         }
       else
         name = machine
@@ -152,23 +192,17 @@ class Chef::Provider::MachineBatch < Chef::Provider::LWRPBase
           :spec => machine_spec,
           :desired_driver => new_resource.driver,
           :files => new_resource.files,
-          :options => new_machine_options
+          :machine_options => proc { |driver| machine_options(driver) }
         }
       end
-    end.select { |m| !m.nil? }.to_a
+    end.to_a
   end
 
-  def new_machine_options
-    @new_machine_options ||= begin
-      result = { :convergence_options => { :chef_server => new_resource.chef_server } }
-      result = Chef::Mixin::DeepMerge.hash_only_merge(result, new_config[:machine_options]) if new_config[:machine_options]
-      result = Chef::Mixin::DeepMerge.hash_only_merge(result, new_resource.machine_options)
-      result
-    end
-  end
-
-  def new_config
-    @new_config ||= run_context.chef_metal.driver_config_for(new_resource.driver)
+  def machine_options(driver)
+    result = { :convergence_options => { :chef_server => new_resource.chef_server } }
+    result = Chef::Mixin::DeepMerge.hash_only_merge(result, run_context.chef_metal.config[:machine_options]) if run_context.chef_metal.config[:machine_options]
+    result = Chef::Mixin::DeepMerge.hash_only_merge(result, driver.config[:machine_options]) if driver.config && driver.config[:machine_options]
+    result = Chef::Mixin::DeepMerge.hash_only_merge(result, new_resource.machine_options)
+    result
   end
-
 end

data/lib/chef_metal.rb

@@ -30,23 +30,44 @@ module ChefMetal
     @@registered_driver_classes[name] = driver
   end
 
-  def self.config_for_url(driver_url, config = Cheffish.profiled_config)
-    if config && config[:drivers] && config[:drivers][driver_url]
-      config = Cheffish::MergedConfig.new(config[:drivers][driver_url], config)
-    end
-    config || {}
-  end
-
   def self.default_driver(config = Cheffish.profiled_config)
     driver_for_url(config[:driver], config)
   end
 
-  def self.driver_for_url(driver_url, config = Cheffish.profiled_config)
-    cluster_type = driver_url.split(':', 2)[0]
-    require "chef_metal/driver_init/#{cluster_type}"
-    driver_class = @@registered_driver_classes[cluster_type]
-    config = config_for_url(driver_url, config)
-    driver_class.from_url(driver_url, config || {})
+  def self.driver_for_url(driver_url, config = Cheffish.profiled_config, allow_different_config = false)
+    #
+    # Create and cache the driver
+    #
+    #
+    # Figure out the driver class
+    #
+    scheme = driver_url.split(':', 2)[0]
+    require "chef_metal/driver_init/#{scheme}"
+    driver_class = @@registered_driver_classes[scheme]
+
+    #
+    # Merge in any driver-specific config
+    #
+    if config[:drivers] && config[:drivers][driver_url]
+      config = Cheffish::MergedConfig.new(config[:drivers][driver_url], config)
+    end
+
+    #
+    # Canonicalize the URL
+    #
+    canonicalized_url, canonicalized_config = driver_class.canonicalize_url(driver_url, config)
+    config = canonicalized_config if canonicalized_config
+
+    #
+    # Merge in config from the canonicalized URL if it is different
+    #
+    if canonicalized_url != driver_url
+      if config[:drivers] && config[:drivers][canonicalized_url]
+        config = Cheffish::MergedConfig.new(config[:drivers][canonicalized_url], config)
+      end
+    end
+
+    driver_class.from_url(canonicalized_url, config)
   end
 
   def self.connect_to_machine(machine_spec, config = Cheffish.profiled_config)

data/lib/chef_metal/chef_run_data.rb

@@ -13,10 +13,18 @@ module ChefMetal
 
     attr_reader :config
     attr_reader :drivers
+    attr_reader :current_driver
 
-    with :driver
     with :machine_options
 
+    def with_driver(driver, options = nil, &block)
+      if drivers[driver] && options
+        raise "Driver #{driver} has already been created, options #{options} would be ignored!"
+      end
+      @current_driver = driver
+      @current_driver_options = options
+    end
+
     def auto_batch_machines
       if !@auto_batch_machines.nil?
         @auto_batch_machines
@@ -37,7 +45,7 @@ module ChefMetal
       if @current_machine_options
         @current_machine_options
       else
-        driver_config_for(current_driver)[:machine_options] || {}
+        driver_for(current_driver).config[:machine_options] || {}
       end
     end
 
@@ -49,15 +57,22 @@ module ChefMetal
       driver.is_a?(String) ? driver_for_url(driver) : driver
     end
 
-    def driver_config_for(driver)
-      ChefMetal.config_for_url(driver_for(driver).driver_url, config)
-    end
+    private
 
     def driver_for_url(driver_url)
       drivers[driver_url] ||= begin
-        driver = ChefMetal.driver_for_url(driver_url, config)
+        if driver_url == @current_driver && @current_driver_options
+          # Use the driver options if available
+          merged_config = Cheffish::MergedConfig.new({ :driver_options => @current_driver_options }, config)
+          driver = ChefMetal.driver_for_url(driver_url, merged_config)
+        else
+          driver = ChefMetal.driver_for_url(driver_url, config)
+        end
         # Check the canonicalized driver_url from the driver
         if driver.driver_url != driver_url
+          if drivers[driver.driver_url] && @current_driver_options
+            raise "Canonical driver #{driver.driver_url} for #{driver_url} has already been created!  Current options #{@current_driver_options} would be ignored."
+          end
           drivers[driver.driver_url] ||= driver
         else
           driver

data/lib/chef_metal/recipe_dsl.rb

@@ -13,8 +13,8 @@ require 'chef/provider/machine_execute'
 class Chef
   module DSL
     module Recipe
-      def with_driver(driver, &block)
-        run_context.chef_metal.with_driver(driver, &block)
+      def with_driver(driver, options = nil, &block)
+        run_context.chef_metal.with_driver(driver, options, &block)
       end
 
       def with_machine_options(machine_options, &block)

data/lib/chef_metal/transport/ssh.rb

@@ -125,8 +125,9 @@ module ChefMetal
             Chef::Log.debug("Closing SSH session on #{username}@#{host}")
             @session.close
           rescue
+          ensure
+            @session = nil
           end
-          @session = nil
         end
       end
 
@@ -136,37 +137,16 @@ module ChefMetal
         true
       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}")
+        disconnect
         false
       rescue Net::SSH::AuthenticationFailed, Net::SSH::HostKeyMismatch
         Chef::Log.debug("#{username}@#{host} unavailable: SSH authentication error: #{$!.inspect} ")
+        disconnect
         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, ssh_start_opts)
-          rescue Errno::ETIMEDOUT
-            Chef::Log.debug("Timed out connecting to gateway: #{$!}")
-            raise InitialConnectTimeout.new($!)
-          end
-        end
-      end
-
       def session
         @session ||= begin
           ssh_start_opts = { timeout:10 }.merge(ssh_options)
@@ -230,6 +210,29 @@ module ChefMetal
 
         attr_reader :original_error
       end
+
+      private
+
+      def gateway?
+        options.key?(:ssh_gateway) and ! options[:ssh_gateway].nil?
+      end
+
+      def gateway
+        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, ssh_start_opts)
+        rescue Errno::ETIMEDOUT
+          Chef::Log.debug("Timed out connecting to gateway: #{$!}")
+          raise InitialConnectTimeout.new($!)
+        end
+      end
     end
   end
 end

data/lib/chef_metal/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal
 version: !ruby/object:Gem::Version
-  version: 0.11.beta.6
+  version: 0.11.beta.7
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -86,42 +86,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.beta.3
+        version: 0.5.beta.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.beta.3
+        version: 0.5.beta.4
 - !ruby/object:Gem::Dependency
   name: chef-metal-fog
   requirement: !ruby/object:Gem::Requirement
     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-vagrant
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.beta
+        version: 0.4.beta.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.beta
+        version: 0.4.beta.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement