chef-metal 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b5b77eda4e67ca220d4da85c229bf92a631b929
-  data.tar.gz: abfe51b9c4acb33b1899db61b79ade829d698142
+  metadata.gz: 00a282ef18ac2646f17721192ffadb941fdcb633
+  data.tar.gz: 5661ed9e46d23ca6d8a58a7b7ea83e2004dea534
 SHA512:
-  metadata.gz: 102d45d0a267f8dabad59a74cf7a90d53313c733e4b965b0fabe5ffe64ad37fa8d38f2a77315e4f4d49f4290e66a50bd6740e01ef4b870607527e456267eed1c
-  data.tar.gz: 4621a363a04b449146fbe2b79e8f23d98f956fbe2222c1b796ff56316db6670710079548feeb2b176652ae44fcc4a94a57484ef449e92bea69e620a48f896c15
+  metadata.gz: 14715c670bde674c517bf4239b558e0cd435e0a9b9bcfee580c71653fc10699b792461563c818f004519c089272365fc38bf47c0c818eb094a451177dd68991a
+  data.tar.gz: f11ccb2cea40c9afab0ad34eddd177c297a8ba169a9f34f757048866f36af6ceffea92bc9e5852ad27e78928c536218698c9b62e40b2f45dbc27df71b4eba93c

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Chef Metal Changelog
 
+## 0.9.4 (4/23/2014)
+
+- Preserve provisioner_output in machine resource (don't destroy it!!)
+
 ## 0.9.3 (4/13/2014)
 
 - SSH: Treat EHOSTUNREACH as "machine not yet available" (helps with AWS)

data/README.md

@@ -1,5 +1,5 @@
-ChefMetal
-=========
+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!
 
@@ -54,6 +54,11 @@ 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
 ------------
 
@@ -67,6 +72,21 @@ The provisioner API is separated out so that new provisioners can be made with m
 
 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.
 
+Provisioners each have their own repository.  Current provisioners:
+
+**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)
+
+**Containers:**
+- [LXC](https://github.com/opscode/chef-metal-lxc)
+- [Docker](https://github.com/opscode/chef-metal-docker)
+
+**Bare Metal:**
+- [SSH (no PXE)](https://github.com/double-z/chef-metal-ssh)
+
 ### Vagrant
 
 chef-zero comes with a provisioner for Vagrant, an abstraction that covers VirtualBox, VMWare and other Virtual Machine providers. To run it, you can check out the sample recipes with:

data/lib/chef/provider/machine.rb

@@ -16,6 +16,8 @@ class Chef::Provider::Machine < Chef::Provider::LWRPBase
   action :create do
     node_json = node_provider.new_json
     node_json['normal']['provisioner_options'] = new_resource.provisioner_options
+    # Preserve provisioner_output, whatever the cost
+    node_json['normal']['provisioner_output'] = node_provider.current_json['normal']['provisioner_output']
     machine = new_resource.provisioner.acquire_machine(self, node_json)
     begin
       machine.setup_convergence(self, new_resource)
@@ -33,6 +35,8 @@ class Chef::Provider::Machine < Chef::Provider::LWRPBase
   action :converge do
     node_json = node_provider.new_json
     node_json['normal']['provisioner_options'] = new_resource.provisioner_options
+    # Preserve provisioner_output, whatever the cost
+    node_json['normal']['provisioner_output'] = node_provider.current_json['normal']['provisioner_output']
     machine = new_resource.provisioner.connect_to_machine(node_json)
     begin
       machine.converge(self, new_resource.chef_server)
@@ -44,6 +48,8 @@ class Chef::Provider::Machine < Chef::Provider::LWRPBase
   action :stop do
     node_json = node_provider.new_json
     node_json['normal']['provisioner_options'] = new_resource.provisioner_options
+    # Preserve provisioner_output, whatever the cost
+    node_json['normal']['provisioner_output'] = node_provider.current_json['normal']['provisioner_output']
     new_resource.provisioner.stop_machine(self, node_json)
   end
 

data/lib/chef/provider/machine_batch.rb

@@ -0,0 +1,49 @@
+require 'chef/provider/lwrp_base'
+require 'chef_metal/provider_action_handler'
+require 'chef/chef_fs/parallelizer'
+
+class Chef::Provider::MachineBatch < Chef::Provider::LWRPBase
+
+  include ChefMetal::ProviderActionHandler
+
+  use_inline_resources
+
+  def whyrun_supported?
+    true
+  end
+
+  action :create do
+    # Collect nodes by provisioner
+
+    by_provisioner = new_resource.machines.group_by { |machine| machine.provisioner }
+    # Talk to each provisioner in parallel
+    Chef::ChefFS::Parallelizer.parallelize(by_provisioner) do |provisioner, machines|
+      nodes_json = machines.map do |machine|
+        node_json = node_providers[machine].node_json
+        node_json['normal']['provisioner_options'] = machine.provisioner_options
+        node_json
+      end
+      if provisioner.respond_to?(:acquire_machines)
+        provisioner.acquire_machines(self, nodes_json)
+      else
+        Chef::ChefFS::Parallelizer.parallelize(nodes_json) do |node_json|
+          provisioner.acquire_machine(self, node_json)
+        end
+      end
+    end
+  end
+
+  attr_reader :node_providers
+
+  def load_current_resource
+    @node_providers = {}
+    new_resource.machines.each do |machine|
+      @node_providers[machine] = Chef::Provider.ChefNode.new(machine, nil)
+    end
+    # Load nodes in parallel
+    Chef::ChefFS::Parallelizer.parallelize(@node_providers.values) do |node_provider|
+      node_provider.load_current_resource
+    end
+  end
+
+end

data/lib/chef/resource/machine_batch.rb

@@ -0,0 +1,13 @@
+require 'chef/resource/lwrp_base'
+
+class Chef::Resource::MachineBatch < Chef::Resource::LWRPBase
+  def initialize(*args)
+    super
+    @machines = []
+  end
+
+  actions :create, :setup, :converge, :stop
+  default_action :create
+
+  attribute :machines, :kind_of => [ Array ]
+end

data/lib/chef_metal/version.rb

@@ -1,3 +1,3 @@
 module ChefMetal
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -151,9 +151,11 @@ files:
 - README.md
 - CHANGELOG.md
 - lib/chef/provider/machine.rb
+- lib/chef/provider/machine_batch.rb
 - lib/chef/provider/machine_execute.rb
 - lib/chef/provider/machine_file.rb
 - lib/chef/resource/machine.rb
+- lib/chef/resource/machine_batch.rb
 - lib/chef/resource/machine_execute.rb
 - lib/chef/resource/machine_file.rb
 - lib/chef_metal/action_handler.rb