chef-metal 0.14.1 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 368e0e132c85d20a3faa50413fc99a465e9d1503
-  data.tar.gz: ea62225030d4b8282a64c5c7a717f9ee426c71e3
+  metadata.gz: 5749137daded5cf0892f7b9644a8ff02cc583dee
+  data.tar.gz: 71de4e147d8293f3ef2926782267ccd6a1b1b661
 SHA512:
-  metadata.gz: e700f73768424ba14c0bb8fb8231268e03f3d0fcd08ba68679b439a2fde8fd00243be60309035c0bb124b8826b2bfeae32c4e6514f7ae22308410ca1c7993fc5
-  data.tar.gz: ebc04780f345f02bfad9bd5c817fda7fa9997b4771b18037167d654d7c8354fa775097005040acb843ea63e56c8a8a59730e64a3456c95ef71b7f97b3b976c7a
+  metadata.gz: 139a845c49f82f68dbe825e3a979bc9089409dac57da88c3f882a3d29ebc502a3f01eddcd6b904a2f865cd9c1fc37051dc27dc612e80c32b1287ad9df1feac73
+  data.tar.gz: 16563847c88a20311a09aebc7c5aa565c49316cf5e19d95de5f8bea01f3d10f05fa5c907476ae03762d51bb1f561b01f37be9e92230be52499c3be0211161341

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Chef Metal Changelog
 
+## 0.14.2 (9/2/2014)
+
+- Disable auto batching
+- Fix for with_machine_options context hash 
+- Pass timeout from execution_options to winrm set_timeout
+- Add better error message when driver does not specify driver_url
+- Add info that location.driver_url is required
+- Remove Chef 11.14 alpha note in readme
+- Gracefully handle Host Down and Network Unreachable
+
 ## 0.14.1 (8/18/2014)
 
 - Fix "metal execute mario ls" to work again

data/README.md

@@ -25,8 +25,6 @@ Try It Out
 
 You can try out Metal in many different flavors.
 
-HINT: chef-metal looks prettiest with chef 11.14 alpha.  `gem install chef --pre` to get it.
-
 ### Vagrant
 
 To give it a spin, install Vagrant and VirtualBox and try this from the `chef-metal/docs/examples` directory:

data/lib/chef/provider/machine.rb

@@ -133,6 +133,7 @@ class Chef::Provider::Machine < Chef::Provider::LWRPBase
           result
         end
     }
+
     configs << new_resource.machine_options if new_resource.machine_options
     configs << driver.config[:machine_options] if driver.config[:machine_options]
     Cheffish::MergedConfig.new(*configs)

data/lib/chef/resource/machine.rb

@@ -92,6 +92,23 @@ class Chef::Resource::Machine < Chef::Resource::LWRPBase
     @machine_options = Cheffish::MergedConfig.new(options, @machine_options)
   end
 
+
+  # This is here because metal users will probably want to do things like:
+  # machine "foo"
+  #   action :destroy
+  # end
+  #
+  # with_machine_options :bootstrap_options => {...}
+  # machine "foo"
+  #   converge true
+  # end
+  #
+  # Without this, the first resource's machine options will obliterate the second
+  # resource's machine options, and then unexpected (and undesired) things happen.
+  def load_prior_resource
+    Chef::Log.debug "Overloading #{self.resource_name} load_prior_resource with NOOP"
+  end
+
   # chef client version and omnibus
   # chef-zero boot method?
   # chef-client -z boot method?

data/lib/chef_metal/chef_machine_spec.rb

@@ -54,6 +54,9 @@ module ChefMetal
     # saved automatically for you after allocate_machine and ready_machine.
     #
     def save(action_handler)
+      if location && (!location.is_a?(Hash) || !location['driver_url'])
+        raise "Drivers must specify a canonical driver_url in machine_spec.location.  Contact your driver's author."
+      end
       # Save the node to the server.
       _self = self
       _chef_server = _self.chef_server

data/lib/chef_metal/chef_run_data.rb

@@ -1,11 +1,10 @@
 require 'chef/mixin/deep_merge'
-require 'cheffish/with_pattern'
 require 'cheffish/merged_config'
 require 'chef_metal/chef_machine_spec'
 
 module ChefMetal
   class ChefRunData
-    extend Cheffish::WithPattern
+
     def initialize(config)
       @config = config
       @drivers = {}
@@ -14,28 +13,41 @@ module ChefMetal
     attr_reader :config
     attr_reader :drivers
     attr_reader :current_driver
+    attr_accessor :current_machine_options
+    attr_accessor :current_image_options
 
-    with :machine_options
-    with :image_options
 
-    def with_driver(driver, options = nil, &block)
-      if drivers[driver] && options
-        raise "Driver #{driver} has already been created, options #{options} would be ignored!"
+    def with_machine_options(value)
+      old_value = self.current_machine_options
+      self.current_machine_options = value
+      if block_given?
+        begin
+          yield
+        ensure
+          self.current_machine_options = old_value
+        end
       end
-      @current_driver = driver
-      @current_driver_options = options
     end
 
-    def auto_batch_machines
-      if !@auto_batch_machines.nil?
-        @auto_batch_machines
-      else
-        config[:auto_batch_machines]
+    def with_image_options(value)
+      old_value = self.current_image_options
+      self.current_image_options = value
+      if block_given?
+        begin
+          yield
+        ensure
+          self.current_image_options = old_value
+        end
       end
     end
 
-    def auto_batch_machines=(value)
-      @auto_batch_machines = value
+
+    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 current_driver

data/lib/chef_metal/recipe_dsl.rb

@@ -41,14 +41,6 @@ class Chef
 
       NOT_PASSED = Object.new
 
-      def auto_batch_machines(value = NOT_PASSED)
-        if value == NOT_PASSED
-          run_context.chef_metal.auto_batch_machines
-        else
-          run_context.chef_metal.auto_batch_machines = value
-        end
-      end
-
       @@next_machine_batch_index = 0
 
       def machine_batch_default_name
@@ -69,47 +61,11 @@ class Chef
         end
       end
 
-      # When the machine resource is first declared, create a machine_batch (if there
-      # isn't one already)
-      def machine(name, &block)
-        resource = build_resource(:machine, name, caller[0], &block)
-
-        # Grab the previous resource so we can decide whether to batch this or make it its own resource.
-        previous_index = run_context.resource_collection.previous_index
-        previous = previous_index >= 0 ? run_context.resource_collection[previous_index] : nil
-        if run_context.chef_metal.auto_batch_machines &&
-           previous &&
-           Array(resource.action).size == 1 &&
-           Array(previous.action) == Array(resource.action)
-
-          # Handle batching similar machines (with similar actions)
-          if previous.is_a?(Chef::Resource::MachineBatch)
-            # If we see a machine declared after a previous machine_batch with the same action, add it to the batch.
-            previous.machines << resource
-          elsif previous.is_a?(Chef::Resource::Machine)
-            # If we see two machines in a row with the same action, batch them.
-            _self = self
-            batch = build_resource(:machine_batch, machine_batch_default_name) do
-              action resource.action
-              machines [ previous, resource ]
-            end
-            batch.from_recipe self
-            run_context.resource_collection[previous_index] = batch
-          else
-            run_context.resource_collection.insert(resource)
-          end
-
-        else
-          run_context.resource_collection.insert(resource)
-        end
-        resource
-      end
     end
   end
 
   class Config
     default(:driver) { ENV['CHEF_DRIVER'] }
-    default(:auto_batch_machines) { true }
   #   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

data/lib/chef_metal/transport/ssh.rb

@@ -141,7 +141,7 @@ 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::Disconnect
+      rescue Timeout::Error, Errno::EHOSTUNREACH, Errno::ENETUNREACH, Errno::EHOSTDOWN, Errno::ETIMEDOUT, Errno::ECONNREFUSED, Errno::ECONNRESET, Net::SSH::Disconnect
         Chef::Log.debug("#{username}@#{host} unavailable: network connection failed or broke: #{$!.inspect}")
         disconnect
         false

data/lib/chef_metal/transport/winrm.rb

@@ -19,6 +19,7 @@ module ChefMetal
 
       def execute(command, execute_options = {})
         output = with_execute_timeout(execute_options) do
+          session.set_timeout(execute_timeout(execute_options))
           session.run_powershell_script(command) do |stdout, stderr|
             stream_chunk(execute_options, stdout, stderr)
           end

data/lib/chef_metal/version.rb

@@ -1,3 +1,3 @@
 module ChefMetal
-  VERSION = '0.14.1'
+  VERSION = '0.14.2'
 end

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.14.2
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !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
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: cheffish
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: winrm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A library for creating machines and infrastructures idempotently in Chef.
@@ -146,11 +146,10 @@ extra_rdoc_files:
 - CHANGELOG.md
 - LICENSE
 files:
-- CHANGELOG.md
+- Rakefile
 - LICENSE
 - README.md
-- Rakefile
-- bin/metal
+- CHANGELOG.md
 - lib/chef/provider/machine.rb
 - lib/chef/provider/machine_batch.rb
 - lib/chef/provider/machine_execute.rb
@@ -161,32 +160,32 @@ files:
 - lib/chef/resource/machine_execute.rb
 - lib/chef/resource/machine_file.rb
 - lib/chef/resource/machine_image.rb
-- lib/chef_metal.rb
 - lib/chef_metal/action_handler.rb
 - lib/chef_metal/add_prefix_action_handler.rb
 - lib/chef_metal/chef_image_spec.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.rb
 - lib/chef_metal/convergence_strategy/install_cached.rb
 - lib/chef_metal/convergence_strategy/install_msi.rb
 - lib/chef_metal/convergence_strategy/install_sh.rb
 - 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/image_spec.rb
-- lib/chef_metal/machine.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/recipe_dsl.rb
-- lib/chef_metal/transport.rb
 - lib/chef_metal/transport/ssh.rb
 - lib/chef_metal/transport/winrm.rb
+- lib/chef_metal/transport.rb
 - lib/chef_metal/version.rb
-- spec/integration/machine.rb
+- lib/chef_metal.rb
+- bin/metal
 homepage: http://wiki.opscode.com/display/chef
 licenses: []
 metadata: {}
@@ -196,19 +195,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A library for creating machines and infrastructures idempotently in Chef.
 test_files: []
-has_rdoc: 

data/spec/integration/machine.rb

@@ -1,29 +0,0 @@
-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