knife-zero 1.15.2 → 1.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30765529147d0bfd82148ca0d57b8bc957e98392
-  data.tar.gz: 0aa9d5f14811840d8c46a8345ef5c763bd7322b8
+  metadata.gz: f101736fd4259132c3bc58de4ebc0242cf4384f3
+  data.tar.gz: 4c792fe31836a9bd6ae261247ff64fa21949ec9a
 SHA512:
-  metadata.gz: 479914f23b6d8018c02403fe7441c72dc2dd2aebf9b00c64e6c50e577d7e71b1537f5655d55b2be300cce6a37998c06da016e8d5ef32279b8ceb665d19338aaa
-  data.tar.gz: b73672f8f5fff324a45f75fe88adecb0916c1ff88e098ed83331537c8de04bd45a42a2d962eee4f52bba90816ee621c317deef58b4fddfab6681b35bd25a1e12
+  metadata.gz: 3c239c00cf00bc9061238c8f6cfcc566f16a91c753c36bc92d056f557159c1904ba63ab05d8b54e7b473aafa65749dc515f72e569d50173dea3d5b88ee245fb4
+  data.tar.gz: 12518b6fe5f43e0f850d9c78f94c7dfa2cc4d265a5273717a781da037b01b3bb30f6de23f3548fec4da58d6ebf8d840a1ece868233f77984c4672feb6ed0f98d

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 ## Unreleased
 
 Empty.
+## v1.15.3
+
+- [Bugfix] move overridden options of bootstrap into deps.
+    - The new change about policy_group breaks knife bootstrap when policies aren't used #92
 
 ## v1.15.2
 

data/lib/chef/knife/zero_bootstrap.rb

@@ -10,19 +10,27 @@ class Chef
         require 'knife-zero/core/bootstrap_context'
         require 'knife-zero/bootstrap_ssh'
         Chef::Knife::BootstrapSsh.load_deps
+
+        self.options.delete :node_ssl_verify_mode
+        self.options.delete :node_verify_api_cert
+
+        ## Override to use nil by default. It should be create PR
+        option :ssh_user,
+        :short => "-x USERNAME",
+        :long => "--ssh-user USERNAME"
+
+        ## For support policy_document_databag(old style)
+        self.options[:policy_name][:description] = "Policy name to use (F.Y.I: Default policy_group=local)"
+
+        ## Set `local` to default policy_group
+        self.options[:policy_group][:description] = "Policy group name to use (--policy-name must also be given). use 'local' "
+        self.options[:policy_group][:default] = "local"
       end
 
       banner "knife zero bootstrap [SSH_USER@]FQDN (options)"
 
       ## Import from knife bootstrap except exclusions
       self.options = Bootstrap.options.merge(self.options)
-      self.options.delete :node_ssl_verify_mode
-      self.options.delete :node_verify_api_cert
-
-      ## Override to use nil by default. It should be create PR
-      option :ssh_user,
-        :short => "-x USERNAME",
-        :long => "--ssh-user USERNAME"
 
       option :bootstrap_converge,
         :long => "--[no-]converge",
@@ -37,13 +45,6 @@ class Chef
         :proc => lambda { |o| File.read(o) },
         :default => nil
 
-      ## For support policy_document_databag(old style)
-      self.options[:policy_name][:description] = "Policy name to use (F.Y.I: Default policy_group=local)"
-
-      ## Set `local` to default policy_group
-      self.options[:policy_group][:description] = "Policy group name to use (--policy-name must also be given). 'local' by default"
-      self.options[:policy_group][:default] = "local"
-
       def run
         ## Command hook before_bootstrap (After launched Chef-Zero)
         if Chef::Config[:knife][:before_bootstrap]

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = "1.15.2"
+    VERSION = "1.15.3"
     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.2
+  version: 1.15.3
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler