knife-zero 1.15.0 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d422744e83e78c07f23663b5bca62be126aa323
-  data.tar.gz: 176220ade6c9557708da92a1e09f62d7749393a8
+  metadata.gz: 0f27c1dcc062d31c5a6f25fba362697e71267cb7
+  data.tar.gz: 5f374aff7f7934d31004e3736d35eff495b5b6ca
 SHA512:
-  metadata.gz: 4b37c886f5b4cf650a19da872a524c00410f5ed84f986071e5efab720366a693611abec1721b5419d38d7dcc310232bcff694d52bde067e8d128e5a5325d2677
-  data.tar.gz: 8e7b2de341999f08962b0fc251f18ee86d7bd547cea669a98347c9cb71902e92e50952bfbe03f151410fded223c0acf6a1c595f8b38e45b85959f9974ec1c288
+  metadata.gz: 86053394416ccc0c1a3384d462e2d0f7e8331bdf047395551ba32533c457478b8ae71c88ceb2bd9aeddda14d7cf6673127b37d62704937d1421cb75bb5c9b1f2
+  data.tar.gz: 5618d59de9053264b46cd86010dd1cb49985d334ec4a96380ee1da1774ebd2aeddea99a4d3d804ad374c341a72d6e2d336eed9b169ed84f7e238ad7d0d51cff4

data/CHANGELOG.md

@@ -4,6 +4,10 @@
 
 Empty.
 
+## v1.15.1
+
+- Follow Upstream: Support option both identity_file and ssh_identity_file for zero bootstrap. #88
+
 ## v1.15.0
 
 - Feature: specified policy_group from option.

data/lib/chef/knife/zero_bootstrap.rb

@@ -73,7 +73,8 @@ class Chef
         ssh.config[:ssh_port] = config[:ssh_port] || Chef::Config[:knife][:ssh_port]
         ssh.config[:ssh_gateway] = config[:ssh_gateway] || Chef::Config[:knife][:ssh_gateway]
         ssh.config[:forward_agent] = config[:forward_agent] || Chef::Config[:knife][:forward_agent]
-        ssh.config[:identity_file] = config[:identity_file] || Chef::Config[:knife][:identity_file]
+        ssh.config[:identity_file] = config[:identity_file] || Chef::Config[:knife][:identity_file] # DEPRECATED
+        ssh.config[:ssh_identity_file] = config[:ssh_identity_file] || Chef::Config[:knife][:ssh_identity_file]
         ssh.config[:manual] = true
         ssh.config[:host_key_verify] = config[:host_key_verify] || Chef::Config[:knife][:host_key_verify]
         ssh.config[:on_error] = :raise

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = "1.15.0"
+    VERSION = "1.15.1"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-zero
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.15.1
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-28 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler