chef-provisioning 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 463b7984481c02899109347817369d32b4a9a6a5
-  data.tar.gz: aba84a8a5296647299c27b0d1baea5b178d4125d
+  metadata.gz: 0124458c476d6ce597dd57fc510079c56238c4bc
+  data.tar.gz: b0dda9f7069f2e2f6b3d84c5fc82fc3f95925098
 SHA512:
-  metadata.gz: 60abd2a893e76308b8cb5bc7e14ba0abee4cdc1ad8032d6380eab70a14b496d54020540aee2784718d46cb3b3ba590538efa25e3a1e571991c4144693c1b7eb1
-  data.tar.gz: 2f834dfb221a678d089e7b9c8775d463de947193c32e51e7816e4e3d76c262a9f01b711f8692aa4c5a5d0ef281ac71ea544b2564918232a42a0117e52f7f8178
+  metadata.gz: f21041475978c60a64ae379e65500b9dad69d1ec00b21be72b85ae684188bb8646883762be3de3110af903adfeb091f1a4564eac5eb7858a8f9459846f64837c
+  data.tar.gz: bd1c346c5131102658f0097a980afb8142d0cdabdb5ff5ec9f285ba8db6ce6fd542d694205e01615caf0380e245df0b576ba7b5c49202585a638c0f0519587a4

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Change Log
 
+## [2.3.1](https://github.com/chef/chef-provisioning/tree/2.3.1) (2017-04-21)
+[Full Changelog](https://github.com/chef/chef-provisioning/compare/v2.3.0...2.3.1)
+
+**Merged pull requests:**
+
+- Update README.md [\#575](https://github.com/chef/chef-provisioning/pull/575) ([jjasghar](https://github.com/jjasghar))
+
+## [v2.3.0](https://github.com/chef/chef-provisioning/tree/v2.3.0) (2017-04-20)
+[Full Changelog](https://github.com/chef/chef-provisioning/compare/v2.2.1...v2.3.0)
+
+**Merged pull requests:**
+
+- allow cheffish 13.x [\#577](https://github.com/chef/chef-provisioning/pull/577) ([lamont-granquist](https://github.com/lamont-granquist))
+- Fixes for chef13 and cheffish5.x/cheffish-13.x [\#572](https://github.com/chef/chef-provisioning/pull/572) ([jjlimepoint](https://github.com/jjlimepoint))
+
+## [v2.2.1](https://github.com/chef/chef-provisioning/tree/v2.2.1) (2017-03-14)
+[Full Changelog](https://github.com/chef/chef-provisioning/compare/v2.2.0...v2.2.1)
+
 ## [v2.2.0](https://github.com/chef/chef-provisioning/tree/v2.2.0) (2017-03-11)
 [Full Changelog](https://github.com/chef/chef-provisioning/compare/v2.1.1...v2.2.0)
 
@@ -931,4 +949,4 @@
 ## [v0.1](https://github.com/chef/chef-provisioning/tree/v0.1) (2013-12-21)
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Gemfile

@@ -10,9 +10,4 @@ gemspec
 #gem 'chef-provisioning-fog', :path => '../chef-provisioning-fog'
 #gem 'chef-provisioning-aws', :path => '../chef-provisioning-aws'
 #gem 'chef-zero', :path => '../chef-zero'
-group :development do
-#  gem "berkshelf", github: "berkshelf/berkshelf"
-  # TODO we depend on the master branch until chef/chef is released
-  gem "ohai", git: "https://github.com/chef/ohai", branch: "master"
-  gem "chef", git: "https://github.com/chef/chef", branch: "master"
-end
+#gem "berkshelf", github: "berkshelf/berkshelf"

data/README.md

@@ -19,13 +19,17 @@ Due to the age and engagement level with different Drivers they have fallen into
 
 Maintained drivers have a representative in the maintenance policy and get triaged / discussed during office hours. They are
 
-[AWS](https://github.com/chef/chef-provisioning-aws) | [Fog](https://github.com/chef/chef-provisioning-fog)
----- | ---- | ----
-[![Gem Version](https://badge.fury.io/rb/chef-provisioning-aws.svg)](http://badge.fury.io/rb/chef-provisioning-aws) | [![Gem Version](https://badge.fury.io/rb/chef-provisioning-fog.svg)](http://badge.fury.io/rb/chef-provisioning-fog)
+| [AWS](https://github.com/chef/chef-provisioning-aws) | [Fog](https://github.com/chef/chef-provisioning-fog) |
+| ---- | ---- |
+| [![Gem Version](https://badge.fury.io/rb/chef-provisioning-aws.svg)](http://badge.fury.io/rb/chef-provisioning-aws) | [![Gem Version](https://badge.fury.io/rb/chef-provisioning-fog.svg)](http://badge.fury.io/rb/chef-provisioning-fog) |
 
-Two drivers are not maintained by Chef:
+Maintained by Chef-Partners:
+
+* [vSphere](https://github.com/chef-partners/chef-provisioning-vsphere)
+* [vra](https://github.com/chef-partners/chef-provisioning-vra)
+
+One driver are not maintained by Chef:
 
-* [VSphere](https://github.com/CenturyLinkCloud/chef-provisioning-vsphere)
 * [AsureRM](https://github.com/pendrica/chef-provisioning-azurerm)
 
 Unmaintained Drivers are at risk of becoming stale. They are:

data/lib/chef/provisioning/chef_run_data.rb

@@ -99,7 +99,7 @@ module Provisioning
       drivers[driver_url] ||= begin
         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)
+          merged_config = Cheffish::MergedConfig.new({ :driver_options => @current_driver_options }, config.to_hash)
           driver = Chef::Provisioning.driver_for_url(driver_url, merged_config)
         else
           driver = Chef::Provisioning.driver_for_url(driver_url, config)

data/lib/chef/provisioning/recipe_dsl.rb

@@ -59,7 +59,7 @@ class Chef
       def machine_batch(name = nil, &block)
         name ||= machine_batch_default_name
         recipe = self
-        declare_resource(:machine_batch, name, caller[0]) do
+        declare_resource(:machine_batch, name) do
           from_recipe recipe
           instance_eval(&block)
         end

data/lib/chef/provisioning/version.rb

@@ -1,5 +1,5 @@
 class Chef
 module Provisioning
-  VERSION = '2.3.0'
+  VERSION = '2.3.1'
 end
 end

data/lib/chef/resource/machine_batch.rb

@@ -38,7 +38,7 @@ class MachineBatch < Chef::Resource::LWRPBase
   end
 
   def machine(name, &block)
-    machines << from_recipe.build_resource(:machine, name, caller[0], &block)
+    machines << from_recipe.build_resource(:machine, name, &block)
   end
 
   def add_machine_options(options)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -323,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A library for creating machines and infrastructures idempotently in Chef.