clc-fork-chef-metal 0.11.2.alpha.3 → 0.12.1.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ec413f4358d1d7601ba3ea0b49011c5b6fba587
-  data.tar.gz: 08fdb9bb946c90ca6970d5ea0670ef02df177121
+  metadata.gz: 4ab0dfcf01d64e7867adf5fcb1a471d3b7754af4
+  data.tar.gz: 8afd4982fce7d3dce5c2ab3749b5731ba68e0995
 SHA512:
-  metadata.gz: ea84e58f92073cef40e226373f3bf653cb9085104d662d11e83a0f6bd002b9e82353a733bac60fd377d390e7a9252ccb1ccd5c01f567c0baeff26757804f1987
-  data.tar.gz: 791feebf3da5b714ac02ab0a67020c67c7ac5275226fed3719bebde2d06bbca6115ebec89cc8f41a6fdd90ed73ab1d5d01cbc59bcf0e5bb021e9ed409ce4a3d7
+  metadata.gz: 80c3ec5240a3b63ab65f7b2d3f2d8d16754e082ace4206566ead55419cfb22c659bd2ad2513aa5a30e132a57c63043809f76490adf52d6f363ebed7788d1173c
+  data.tar.gz: df2649567b1d3debeebd4b77bf4e223c5dc5f682588c9b1b39b337e8fb0e5128a41e20d1f0cf6dbd2f4da2e72e520022af72c9631112d169e8f912060416928e

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Chef Metal Changelog
 
+## 0.12.1 (6/18/2014)
+
+- fix machine_batch action :setup
+- fix issue with default machine_batch names being non-unique across recipes
+
+## 0.12 (6/18/2014)
+
+- Remove chef-metal-fog and chef-metal-vagrant as dependencies (install whatever things you want directly!)
+- Fix ssl_verify_mode to work correctly when other HTTPS calls are made (@mwrock)
+- Fix machine_file and machine_execute resources (@irvingpop)
+
 ## 0.11.2 (6/4/2014)
 
 - Fix issue where machines with different drivers could get default options from the global current driver

data/README.md

@@ -1,3 +1,4 @@
+[![Stories in Ready](https://badge.waffle.io/opscode/chef-metal.png?label=ready&title=Ready)](https://waffle.io/opscode/chef-metal)
 Chef Metal
 ==========
 
@@ -10,7 +11,7 @@ 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/)
+12/20/2013 | [Chef Metal Alpha](http://www.getchef.com/blog/2013/12/20/chef-metal-alpha/)
 
 Try It Out
 ----------
@@ -24,7 +25,7 @@ HINT: chef-metal looks prettiest with chef 11.14 alpha.  `gem install chef --pre
 To give it a spin, install Vagrant and VirtualBox and try this from the `chef-metal/docs/examples` directory:
 
 ```
-gem install chef-metal
+gem install chef-metal chef-metal-vagrant
 export CHEF_DRIVER=vagrant
 chef-client -z vagrant_linux.rb simple.rb
 ```
@@ -36,7 +37,7 @@ This will create two vagrant precise64 linux boxes, "mario" and "luigi1", in `~/
 If you have an AWS account, you can spin up a machine there like this:
 
 ```
-gem install chef-metal
+gem install chef-metal chef-metal-fog
 export CHEF_DRIVER=fog:AWS
 chef-client -z simple.rb
 ```
@@ -48,7 +49,7 @@ This will create two linux boxes in the AWS account referenced by your default p
 If you are on DigitalOcean and using the `tugboat` gem, you can do this:
 
 ```
-gem install chef-metal
+gem install chef-metal chef-metal-fog
 export CHEF_DRIVER=fog:DigitalOcean
 chef-client -z simple.rb
 ```
@@ -68,7 +69,7 @@ chef-client -z destroy_all.rb
 What Is Chef Metal?
 -------------------
 
-Chef Metal has two major abstractions: the machine resource, anf drivers.
+Chef Metal has two major abstractions: the machine resource, and drivers.
 
 ### The `machine` resource
 
@@ -234,4 +235,3 @@ Bugs and The Plan
 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)
 
 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_batch.rb

@@ -38,7 +38,7 @@ class Chef::Provider::MachineBatch < Chef::Provider::LWRPBase
   action :setup do
     with_ready_machines do |m|
       prefixed_handler = ChefMetal::AddPrefixActionHandler.new(action_handler, "[#{m[:spec].name}] ")
-      machine[:machine].setup_convergence(prefixed_handler)
+      m[:machine].setup_convergence(prefixed_handler)
       m[:spec].save(prefixed_handler)
       Chef::Provider::Machine.upload_files(prefixed_handler, m[:machine], m[:files])
     end

data/lib/chef_metal/recipe_dsl.rb

@@ -39,12 +39,13 @@ class Chef
         end
       end
 
+      @@next_machine_batch_index = 0
+
       def machine_batch_default_name
-        if @machine_batch_index
-          @machine_batch_index += 1
-          "default#{@machine_batch_index}"
+        @@next_machine_batch_index += 1
+        if @@next_machine_batch_index > 1
+          "default#{@@next_machine_batch_index}"
         else
-          @machine_batch_index = 0
           "default"
         end
       end

data/lib/chef_metal/transport/winrm.rb

@@ -65,6 +65,20 @@ $file.Close
         "'#{string.gsub("'", "''")}'"
       end
 
+      def available?
+        # 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
+        Chef::Log.debug("unavailable: network connection failed or broke: #{$!.inspect}")
+        disconnect
+        false
+      rescue Net::SSH::AuthenticationFailed, Net::SSH::HostKeyMismatch
+        Chef::Log.debug("unavailable: winrm authentication error: #{$!.inspect} ")
+        disconnect
+        false
+      end
+
       protected
 
       def session

data/lib/chef_metal/version.rb

@@ -1,3 +1,3 @@
 module ChefMetal
-  VERSION = '0.11.2.alpha.3'
+  VERSION = '0.12.1.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.2.alpha.3
+  version: 0.12.1.alpha.1
 platform: ruby
 authors:
-- Matt Wrock
+- John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !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
@@ -123,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: A library for creating machines and infrastructures idempotently in Chef.
-email: matt.wrock@CenturyLinkCloud.com
+email: jkeiser@opscode.com
 executables:
 - metal
 extensions: []