clc-fork-chef-metal 0.11.beta.6 → 0.11.2.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef0925df69f5f0d7cf6f51b0b849f155d4c2b6ee
-  data.tar.gz: dfc2e5acb07a424fac4d9041dff233c631aaf111
+  metadata.gz: 4aeb6b366bba61cd66941ffbf1159d6a9c8f5e35
+  data.tar.gz: ace414410903b2f164c3699bfb938cf4a9e76292
 SHA512:
-  metadata.gz: cbbc0262f139ba2883711e183cb192f895b3accd2389c56a8b68619b21c85fcbcecbd6cbf134b1b45352729334f6bc5e7a34ff759430fc1eadf6e8fe81dfcd04
-  data.tar.gz: 7b3e07b27e49b7962d1f20a7ef6e7823d70d78b5606022fcac731f53a1c8f6808f9b017a975ed4bd811cfe70fabda92f423b7158aa67099bb0da2f3f3332d2bf
+  metadata.gz: db58b28f165074f0100c5a8db05180e1f28f22fce8868551f295b7f3bef49cc5c44b6c7ec6b3d175517a44b9f5bd6750a0bf7695768e5d12a88baccad6e3ee11
+  data.tar.gz: 3fee03a117fb4ee67076be5c234213d8701d85eccbe5ce615b1c0f6486f316b7edae8d600af427da1e0daa1615c2c5f50a778aef2a67e231643159168bb7851a

data/CHANGELOG.md

@@ -1,9 +1,24 @@
 # Chef Metal Changelog
 
-## 0.11.beta.6 (5/28/2014)
+## 0.11.2 (6/4/2014)
 
-- Fix machine_batch defaults to be significantly less stupid
-- Remove with_machine_batch
+- Fix issue where machines with different drivers could get default options from the global current driver
+
+## 0.11.1 (6/4/2014)
+
+- fix local mode port forwarding on IPv6 hosts
+
+## 0.11 (6/4/2014)
+
+- New Driver interface (see docs/ and blogs/ directories for documentation)
+- New configuration (see docs/ and blogs/)
+- get rid of annoying SSL warning (note: this turns off SSL verification, which was the default anyway)
+- fix machine_batch error report to be less verbose
+- fail when machine is being moved from driver to driver
+- @marcusn disconnect from SSH when there is a problem
+- fix SSH gateway code to honor any options given (@marcusn)
+- Make machine_batch auto batching smarter (only batch things that have the same actions)
+- Allow auto batching to be turned off with `auto_batch_machines = false` in recipes or config
 - Allow this:
   ```ruby
   machine_batch do
@@ -17,20 +32,8 @@
     machines 'a', 'b', 'c'
     action :destroy
   end
-- fix SSH gateway code to honor any options given (@marcusn)
-
-## 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
-
-## 0.11.beta (5/23/2014)
-
-- New Driver interface (see docs/ and blogs/ directories for documentation)
+- fix local mode forwarding in mixed IPv4/IPv6 environments
 
 ## 0.10.2 (5/2/2014)
 

data/README.md

@@ -3,31 +3,72 @@ Chef Metal
 
 This library solves the problem of repeatably creating machines and infrastructures in Chef.  It has a plugin model that lets you write bootstrappers for your favorite infrastructures, including VirtualBox, EC2, LXC, bare metal, and many more!
 
-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.
+[This video](https://www.youtube.com/watch?v=Yb8QdL30WgM) explains the basics of chef-metal (though provisioners are now called drivers).  Slides (more up to date) are [here](http://slides.com/jkeiser/chef-metal).
+
+Date       | Blog
+-----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------
+6/3/2014   | [machine_batch and parallelization](https://github.com/opscode/chef-metal/blob/master/docs/blogs/2012-05-28-machine_batch.html.markdown#chef-metal-parallelization)
+6/3/2014   | [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)
+3/4/2014   | [Chef Metal 0.2: Overview](http://www.getchef.com/blog/2014/03/04/chef-metal-0-2-release/) - this is a pretty good overview (though dated).
+12/20/2014 | [Chef Metal Alpha](http://www.getchef.com/blog/2013/12/20/chef-metal-alpha/)
 
 Try It Out
 ----------
 
-To give it a spin, get chef 11.8 or greater try this:
+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.
 
-    git clone https://github.com/opscode/cheffish.git
-    cd cheffish
-    rake install
-    cd ..
+### Vagrant
 
-    git clone https://github.com/opscode/chef-metal.git
-    cd chef-metal
-    rake install
-    
-    cd chef-metal
-    chef-client -z -o myapp::vagrant,myapp::linux,myapp::small
+To give it a spin, install Vagrant and VirtualBox and try this from the `chef-metal/docs/examples` directory:
+
+```
+gem install chef-metal
+export CHEF_DRIVER=vagrant
+chef-client -z vagrant_linux.rb simple.rb
+```
 
 This will create two vagrant precise64 linux boxes, "mario" and "luigi1", in `~/machinetest`, bootstrapped to an empty runlist.  For Windows, you can replace `myapp::linux` with `myapp::windows`, but you'll need your own Windows vagrant box to do that (licensing!).
 
+### AWS
+
+If you have an AWS account, you can spin up a machine there like this:
+
+```
+gem install chef-metal
+export CHEF_DRIVER=fog:AWS
+chef-client -z simple.rb
+```
+
+This will create two linux boxes in the AWS account referenced by your default profile in `~/.aws/config` (or your environment variables).
+
+### DigitalOcean
+
+If you are on DigitalOcean and using the `tugboat` gem, you can do this:
+
+```
+gem install chef-metal
+export CHEF_DRIVER=fog:DigitalOcean
+chef-client -z simple.rb
+```
+
+If you aren't using the `tugboat` gem, you can put `driver` and `driver_options` into your `.chef/knife.rb` file.
+
+This will use your tugboat settings to create whatever sort of instance you normally create.
+
+### Cleaning up
+
+When you are done with the examples, run this to clean up:
+
+```
+chef-client -z destroy_all.rb
+```
+
 What Is Chef Metal?
 -------------------
 
-Chef Metal has two major abstractions: the machine resource, and provisioners.
+Chef Metal has two major abstractions: the machine resource, anf drivers.
 
 ### The `machine` resource
 
@@ -54,148 +95,143 @@ end
 
 You will notice the dynamic nature of the number of web servers.  It's all code, your imagination is the limit :)
 
-Kitchen
--------
-
-Chef Metal also works with Test Kitchen, allowing you to test entire clusters, not just machines!  The repository for the kitchen-metal gem is https://github.com/doubt72/kitchen-metal.
-
-Provisioners
-------------
+### Drivers
 
-Provisioners handle the real work of getting those abstract definitions into real, physical form.  They handle the following tasks, idempotently (you can run the resource again and again and it will only create the machine once--though it may notice things are wrong and fix them!):
+Drivers handle the real work of getting those abstract definitions into real, physical form.  They handle the following tasks, idempotently (you can run the resource again and again and it will only create the machine once--though it may notice things are wrong and fix them!):
 
 * Acquiring machines from the cloud, creating containers or VMs, or grabbing bare metal
 * Connecting to those machines via ssh, winrm, or other transports
 * Bootstrapping chef onto the machines and converging the recipes you suggested
 
-The provisioner API is separated out so that new provisioners can be made with minimal effort (without having to rewrite ssh, tunneling, bootstrapping, and OS support).  But to the user, they appear as a single thing, so that the machine acquisition can use its smarts to autodetect the other bits (transports, OS's, etc.).
+The driver API is separated out so that new drivers can be made with minimal effort (without having to rewrite ssh, tunneling, bootstrapping, and OS support).  But to the user, they appear as a single thing, so that the machine acquisition can use its smarts to autodetect the other bits (transports, OS's, etc.).
 
-Provisioners save their data in the Chef node itself, so that they will be accessible to everyone who is using the Chef server to manage the nodes.
+Drivers save their data in the Chef node itself, so that they will be accessible to everyone who is using the Chef server to manage the nodes.
 
-Provisioners each have their own repository.  Current provisioners:
+Drivers each have their own repository.  Current drivers:
 
 **Cloud:**
 - [FOG: EC2, DigitalOcean, OpenStack, etc.](https://github.com/opscode/chef-metal-fog)
 
 **Virtualization:**
 - [Vagrant: VirtualBox, VMWare Fusion, etc.](https://github.com/opscode/chef-metal-vagrant)
+- [VSphere](https://github.com/RallySoftware-cookbooks/chef-metal-vsphere) (not yet up to date with 0.11)
 
 **Containers:**
-- [LXC](https://github.com/opscode/chef-metal-lxc)
-- [Docker](https://github.com/opscode/chef-metal-docker)
+- [LXC](https://github.com/opscode/chef-metal-lxc) (not yet up to date with 0.11)
+- [Docker](https://github.com/opscode/chef-metal-docker) (not yet up to date with 0.11)
 
 **Bare Metal:**
-- [SSH (no PXE)](https://github.com/double-z/chef-metal-ssh)
-
-### Vagrant
+- [SSH (no PXE)](https://github.com/double-z/chef-metal-ssh) (not yet up to date with 0.11)
 
-chef-zero comes with a provisioner for Vagrant, an abstraction that covers VirtualBox, VMWare and other Virtual Machine drivers. To run it, you can check out the sample recipes with:
+### Anatomy of a Recipe
 
-```
-chef-client -z -o myapp::vagrant,myapp::linux,myapp::small
-```
-
-The provisioner specification is in myapp::vagrant and myapp::linux [sample recipes](https://github.com/opscode/chef-metal/tree/master/cookbooks/myapp/recipes), copy/pasted here for your convenience:
+chef-zero comes with a provisioner for Vagrant, an abstraction that covers VirtualBox, VMWare and other Virtual Machine drivers. In docs/examples, you can run this to try it:
 
 ```ruby
-vagrant_cluster "#{ENV['HOME']}/machinetest"
-
-directory "#{ENV['HOME']}/machinetest/repo"
-with_chef_local_server :chef_repo_path => "#{ENV['HOME']}/machinetest/repo"
-
-vagrant_box 'precise64' do
-  url 'http://files.vagrantup.com/precise32.box' 
-end
+export CHEF_DRIVER=vagrant
+chef-client -z vagrant_linux.rb simple.rb
 ```
 
-`vagrant_cluster` declares a directory where all the vagrant definitions will be stored, and uses `with_provisioner` internally to tell Chef Metal that this is the provisioner we want to use for machines.
+This is a chef-client run, which runs multiple **recipes.** Chef Metal is nothing but resources you put in recipes.
 
-`vagrant_box` makes sure a particular vagrant box exists, and lets you specify `provisioner_options` for things like port forwarding, OS definitions, and any other vagrant-isms.  A more complicated vagrant box, with provisioner options, can be found in [myapp::windows](https://github.com/opscode/chef-metal/blob/master/cookbooks/myapp/recipes/windows.rb).
+The driver is specified on the command line.  Drivers are URLs.  You could use `vagrant:~/vms` or `fog:AWS:default:us-east-1' as driver URLs.  More information [here.](https://github.com/opscode/chef-metal/blob/master/docs/configuration.md#setting-the-driver-with-a-driver-url)
 
-`with_chef_local_server` is a generic directive that creates a chef-zero server pointed at the given repository.  nodes, clients, data bags, and all data will be stored here on your provisioner machine if you do this.  You can use `with_chef_server` instead if you want to point at OSS, Hosted or Enterprise Chef, and if you don't specify a Chef server at all, it will use the one you are running chef-client against. Keep in mind when using `with_chef_server` and running `chef-client -z` on your workstation that you will also need to set the client name and signing key for the chef server. If you've already got knife.rb set up, then something like this will correctly create a client for the chef server on instance using your knife.rb configuration:
+The `vagrant_linux.rb` recipe handles the physical specification of the machines and Vagrant box:
 
 ```ruby
-require 'chef/config'
+require 'chef_metal_vagrant'
 
-with_chef_server "https://chef-server.example.org", {
-  :client_name => Chef::Config[:node_name],
-  :signing_key_filename => Chef::Config[:client_key]
+vagrant_box 'precise64' do
+  url 'http://files.vagrantup.com/precise64.box'
+end
+
+with_machine_options :vagrant_options => {
+  'vm.box' => 'precise64'
 }
 ```
 
-Typically, you declare these in separate files from your machine resources.  Chef Metal picks up the provisioners you have declared, and uses them to instantiate the machines you request.  The actual machine definitions, in this case, are in `myapp::small`, and are generic--you could use them against EC2 as well:
+`require 'chef_metal_vagrant'` is how we bring in the `vagrant_box` resource.
 
-```ruby
-machine 'mario' do
-  recipe 'postgresql'
-  recipe 'mydb'
-  tag 'mydb_master'
-end
+`vagrant_box` makes sure a particular vagrant box exists, and lets you specify `machine_options` for things like port forwarding, OS definitions, and any other vagrant-isms.
 
-num_webservers = 1
+Typically, you declare these in separate files from your machine resources.  Chef Metal picks up the drivers and machine_options you have declared, and uses them to instantiate the machines you request.  The actual machine definitions, in this case, are in `simple.rb`, and are generic--you could use them against Azure or EC2 as well:
 
-1.upto(num_webservers) do |i|
-  machine "luigi#{i}" do
-    recipe 'apache'
-    recipe 'mywebapp'
-  end
+```ruby
+machine 'mario' do
+  tag 'itsame'
 end
 ```
 
-### Fog (EC2 and friends)
+Other directives, like `recipe 'apache'`, help you set run lists and other information about the machine.
+
+### Fog (EC2, Openstack and friends)
 
-chef-metal also comes with a [Fog](http://fog.io/) provisioner that handles provisioning to Amazon's EC2 and other cloud drivers.  (Only EC2 has been tested so far.)  Before you begin, you will need to put your AWS credentials in ~/.aws/config in the format [mentioned in Option 1 here](http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-started.html#d0e726).
+chef-metal also comes with a [Fog](http://fog.io/) provisioner that handles provisioning to Openstack, Rackspace, Amazon's EC2 and other cloud drivers.  Before you begin, you will need to put your AWS credentials in ~/.aws/config in the format [mentioned in Option 1 here](http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-started.html#d0e726).  There are other ways to specify your credentials, but this is the standard one for the Amazon CLI.
 
 Once your credentials are in, basic usage looks like this:
 
 ```
-chef-client -z -o myapp::ec2,myapp::small
+export CHEF_DRIVER=fog:AWS
+chef-client -z simple.rb
 ```
 
-The provisioner definition in `myapp::ec2` looks like this:
+Other valid URLs include `fog:AWS:myprofilename` and `fog:AWS:profilename:us-west-2`.
 
-```ruby
-ec2testdir = File.expand_path('~/ec2test')
+Most Chef Metal drivers try hard to provide reasonable defaults so you can get started easily.  Once you have specified your credentials, AMIs and other things are chosen for you.
 
-directory ec2testdir
+You will usually want to create or input a custom key pair for bootstrap. To customize, specify keys and AMI and other options, you can make recipes like this:
 
-with_fog_ec2_provisioner # :driver => 'AWS'
+```ruby
+require 'chef_metal_fog'
 
-with_provisioner_options :image_id => 'ami-5ee70037'
+fog_key_pair 'my_bootstrap_key'
 
-fog_key_pair 'me' do
-  private_key_path "#{ec2testdir}/me"
-  public_key_path "#{ec2testdir}/me.pub"
-end
+with_machine_options :bootstrap_options => {
+  :key_name => 'my_bootstrap_key',
+  :image_id => 'ami-59a4a230',
+  :flavor_id => 't1.micro'
+}
 ```
 
-`with_fog_ec2_provisioner` tells chef-metal to use the Fog provisioner against EC2.  If you specify your credentials in `~/.aws/config`, you don't *have* to specify anything else; it will use the Fog defaults.  You may pass a hash of parameters to `with_fog_ec2_provisioner` that is described [here](https://github.com/opscode/chef-metal/blob/master/lib/chef_metal/provisioner/fog_provisioner.rb#L21-L32).
+`fog_key_pair` creates a new key pair (if the files do not already exist) and uploads it to AWS (it will toss an error if the key pair already exists and does not match). By default, `fog_key_pair` will look for matching key files in .chef/keys, ~/.chef/keys and ~/.ssh.  If it does not find one, it will place the key in `.chef/keys`.  You can override this path in fog_key_pair, but if you do, you will want to modify `private_key_paths` in your configuration to match.
+
+`with_machine_options` specifies machine_options that will be applied to any `machine` resources chef-client encounters.
+
+You will notice that we are still using `simple.rb` here.  Machine definitions are generally driver-independent.  This is an important feature that allows you to spin up your clusters in different places to create staging, test or miniature dev environments.
 
-`fog_key_pair` creates a new key pair (if the files do not already exist) and automatically tells the Provisioner to use it to bootstrap subsequent machines.  The private/public key pair will be automatically authorized to log on to the instance on first boot.
+### Pointing Boxes at Chef Servers
 
-To pass options like ami, you can say something like this:
+By default, Chef Metal will put your boxes on the same Chef server you started chef-client with (in the case of -z, that's a local chef-zero server). Sometimes you want to put your boxes on different servers.  There are a couple of ways to do that:
 
 ```ruby
-with_provisioner_options :image_id => 'ami-5ee70037'
+with_chef_local_server :chef_repo_path => '~/repo'
 ```
 
-If you need to pass bootstrapping options on a per-machine basis, you can do that as well by doing something like the following:
+`with_chef_local_server` is a generic directive that creates a chef-zero server pointed at the given repository.  nodes, clients, data bags, and all data will be stored here on your provisioner machine if you do this.
+
+You can use `with_chef_server` instead if you want to point at OSS, Hosted or Enterprise Chef, and if you don't specify a Chef server at all, it will use the one you are running chef-client against. Keep in mind when using `with_chef_server` and running `chef-client -z` on your workstation that you will also need to set the client name and signing key for the chef server. If you've already got knife.rb set up, then something like this will correctly create a client for the chef server on instance using your knife.rb configuration:
 
 ```ruby
-machine "Ubuntu_64bit" do
-  action :create
-  provisioner_options 'bootstrap_options' => {
-    'image_id' => 'ami-59a4a230',
-    'flavor_id' => 't1.micro'
-  }
-end
+with_chef_server "https://chef-server.example.org",
+  :client_name => Chef::Config[:node_name],
+  :signing_key_filename => Chef::Config[:client_key]
 ```
 
-You will notice that we are still using `myapp::small` here.  Machine definitions are generally provisioner-independent.  This is an important feature that allows you to spin up your clusters in different places to create staging, test or miniature dev environments.
+Kitchen
+-------
+
+Chef Metal also works with Test Kitchen, allowing you to test entire clusters, not just machines!  The repository for the kitchen-metal gem is https://github.com/doubt72/kitchen-metal.
+
+Documentation
+-------------
+* [Configuration](https://github.com/opscode/chef-metal/blob/master/docs/configuration.md#configuring-and-using-metal-drivers)
+* [Writing Drivers](https://github.com/opscode/chef-metal/blob/master/docs/building_drivers.md#writing-drivers)
+* [Embedding](https://github.com/opscode/chef-metal/blob/master/docs/embedding.md)
 
 Bugs and The Plan
 -----------------
 
-It's early days.  *Please* submit bugs at https://github.com/opscode/chef-metal/issues, contact jkeiser on Twitter at @jkeiser2, email at jkeiser@opscode.com
+Please submit bugs, gripes and feature requests at [https://github.com/opscode/chef-metal/issues](https://twitter.com/jkeiser2), contact jkeiser on Twitter at @jkeiser2, email at [jkeiser@getchef.com](mailto:jkeiser@getchef.com)
 
-If you are interested in the Plan for Chef Metal, you can peruse our [Trello board](https://trello.com/b/GcSzW0GM/chef-metal)!  Please add suggestions there, vote or comment on issues that are important to you, and feel free to contribute by picking up a card.  Chat with me (jkeiser@opscode.com) if you would like some context on how to go about implementing a card, or just go hog wild and submit a PR :)
+To contribute, just make a PR in the appropriate repo--also, make sure you've [signed the Chef Contributor License Agreement](https://secure.echosign.com/public/hostedForm?formid=PJIF5694K6L) (quick couple of minutes online), since this is going into core Chef eventually. It takes some time to process, so if you've just done it, let me know in the PR :)  If you already signed this for a Chef contribution, you don't need to do so again--if you're not sure, you can check for your name [here](https://wiki.opscode.com/display/chef/Approved+Contributors)!
+Â

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,35 +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)
+  def current_driver
+    if machine_spec.driver_url
+      run_context.chef_metal.driver_for(machine_spec.driver_url)
+    end
   end
 
-  def current_driver
-    run_context.chef_metal.current_driver || (
-      if machine_spec.driver_url
-        run_context.chef_metal.driver_for_url(machine_spec.driver_url)
-      end
-    )
+  def new_machine_options
+    machine_options(new_driver)
   end
 
-  attr_reader :machine_spec
+  def current_machine_options
+    if current_driver
+      machine_options(current_driver)
+    end
+  end
 
-  def machine_options
+  def machine_options(driver)
     configs = []
     configs << {
       :convergence_options =>
@@ -111,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

@@ -25,7 +25,8 @@ class Chef::Provider::MachineBatch < Chef::Provider::LWRPBase
   action :allocate do
     by_new_driver.each do |driver, specs_and_options|
       driver.allocate_machines(action_handler, specs_and_options, parallelizer) do |machine_spec|
-        machine_spec.save(action_handler)
+        prefixed_handler = ChefMetal::AddPrefixActionHandler.new(action_handler, "[#{machine_spec.name}] ")
+        machine_spec.save(prefixed_handler)
       end
     end
   end
@@ -38,7 +39,7 @@ class Chef::Provider::MachineBatch < Chef::Provider::LWRPBase
     with_ready_machines do |m|
       prefixed_handler = ChefMetal::AddPrefixActionHandler.new(action_handler, "[#{m[:spec].name}] ")
       machine[:machine].setup_convergence(prefixed_handler)
-      m[:spec].save(action_handler)
+      m[:spec].save(prefixed_handler)
       Chef::Provider::Machine.upload_files(prefixed_handler, m[:machine], m[:files])
     end
   end
@@ -49,15 +50,17 @@ class Chef::Provider::MachineBatch < Chef::Provider::LWRPBase
       m[:machine].setup_convergence(prefixed_handler)
       m[:spec].save(action_handler)
       Chef::Provider::Machine.upload_files(prefixed_handler, m[:machine], m[:files])
+      # TODO only converge if machine was modified
       m[:machine].converge(prefixed_handler)
-      m[:spec].save(action_handler)
+      m[:spec].save(prefixed_handler)
     end
   end
 
   action :converge_only do
     parallel_do(@machines) do |m|
+      prefixed_handler = ChefMetal::AddPrefixActionHandler.new(action_handler, "[#{m[:spec].name}] ")
       machine = run_context.chef_metal.connect_to_machine(m[:spec])
-      machine.converge(action_handler)
+      machine.converge(prefixed_handler)
     end
   end
 
@@ -101,11 +104,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 +127,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 +150,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 +158,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 +168,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/resource/machine_batch.rb

@@ -41,4 +41,32 @@ class Chef::Resource::MachineBatch < Chef::Resource::LWRPBase
   def add_machine_options(options)
     @machine_options = Chef::Mixin::DeepMerge.hash_only_merge(@machine_options, options)
   end
+
+  # We override this because we want to hide @from_recipe and shorten @machines
+  # in error output.
+  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}\n"
+    [@not_if, @only_if].flatten.each do |conditional|
+      text << "  #{conditional.to_text}\n"
+    end
+    text << "end\n"
+  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] || {}
+        {}
       end
     end
 
@@ -49,15 +57,31 @@ 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)
+    def connect_to_machine(name, chef_server = nil)
+      if name.is_a?(MachineSpec)
+        machine_spec = name
+      else
+        machine_spec = ChefMetal::ChefMachineSpec.get(name, chef_server)
+      end
+      ChefMetal.connect_to_machine(machine_spec, 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
@@ -65,15 +89,6 @@ module ChefMetal
       end
     end
 
-    def connect_to_machine(name, chef_server = nil)
-      if name.is_a?(MachineSpec)
-        machine_spec = name
-      else
-        machine_spec = ChefMetal::ChefMachineSpec.get(name, chef_server)
-      end
-      ChefMetal.connect_to_machine(machine_spec, config)
-    end
-
     def keys
       result = (config.keys || {}).dup
       Array(config.key_path) do |key_path|

data/lib/chef_metal/convergence_strategy/precreate_chef_objects.rb

@@ -173,6 +173,7 @@ module ChefMetal
 chef_server_url #{chef_server_url.inspect}
 node_name #{node_name.inspect}
 client_key #{convergence_options[:client_pem_path].inspect}
+ssl_verify_mode :verify_none
 EOM
       end
     end

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

@@ -109,11 +109,10 @@ module ChefMetal
       def make_url_available_to_remote(local_url)
         uri = URI(local_url)
         host = Socket.getaddrinfo(uri.host, uri.scheme, nil, :STREAM)[0][3]
-        if host == '127.0.0.1' || host == '[::1]'
-          unless session.forward.active_remotes.any? { |port, bind| port == uri.port && bind == '127.0.0.1' }
-            # TODO IPv6
-            Chef::Log.debug("Forwarding local server 127.0.0.1:#{uri.port} to port #{uri.port} on #{username}@#{host}")
-            session.forward.remote(uri.port, '127.0.0.1', uri.port)
+        if host == '127.0.0.1' || host == '::1'
+          unless session.forward.active_remotes.any? { |port, bind| port == uri.port && bind == uri.host }
+            Chef::Log.debug("Forwarding local server #{uri.host}:#{uri.port} to port #{uri.port} on #{username}@#{self.host}")
+            session.forward.remote(uri.port, uri.host, uri.port)
           end
         end
         local_url
@@ -125,8 +124,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 +136,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 +209,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.2.alpha.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clc-fork-chef-metal
 version: !ruby/object:Gem::Version
-  version: 0.11.beta.6
+  version: 0.11.2.alpha.1
 platform: ruby
 authors:
 - Matt Wrock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-06-07 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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.beta.3
+        version: '0.5'
 - !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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.beta.2
+        version: '0.5'
 - !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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.beta
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement