knife-zero 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: faceb4268fabca7f9ce0d461762633eee1e462c7
-  data.tar.gz: 9fa1e9d3057549778c1aecbcd9610bb8b4e78194
+  metadata.gz: a664f1782d8cc36553ad2e5269d10080805568a2
+  data.tar.gz: 44fd1e97f0d4a800980e58bfc465ec45592f4309
 SHA512:
-  metadata.gz: 33bab13eec4bb5b1d9630ecdf740bb61acd08b5d7d435b9a743c048faba61b8ddf8f8a3a13e2cd4190c99fe86b45ea629840421fb26c3beb71e368dba900ff5b
-  data.tar.gz: 18a186631c76e4a9e996f87becc6dde87c834fdc9a6fd306fffe9a20ecb92f4fe9ad32ac732a86bca8656fd3012f8f5b79652ae30a3b1f781d37835f720810a6
+  metadata.gz: d6ef45236ae82c085aa05011cca60505710663c7cb6df5eb7b274dd29e01c5c9d542da3e3fa4ea0c2c1db941a23b33ac38a19faa371571a9a5800df2ae1b065e
+  data.tar.gz: c8d52756ad5cfc23585bf306d13589387910063f32e5d96da1bc21103e3ec28e5164470407ec8e7c44fcf885a8457070f2697fc189836c679f2d2c960ed7dc5a

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## v1.7.1
+
+- Misc: change option name from --without-chef-run to --[no-]converge #25
+
 ## v1.7.0
 
 - Bug: ignored knife[:use_sudo] by converge, #22 #42

data/README.md

@@ -57,7 +57,7 @@ knife zero diagnose # show configuration from file
 Install Chef to remote node and run chef-client under chef-zero via tcp-forward.
 
 Supported options are mostly the same as `knife bootstrap`.
-And it supports why-run(`-W, --why-run`).
+And it supports why-run(`-W, --why-run`)and Bootstrap without first Chef-Client Run.(--no-converge).
 
 #### Example
 
@@ -121,6 +121,60 @@ Bootstrap multi-nodes via GNU Parallel
 $ parallel -j 5 ./bin/knife zero bootstrap ::: nodeA nodeB nodeC...
 ```
 
+#### (Hint)Supress Automatic Attributes
+
+knife-zero supports appengding [whitelist-attributes](https://docs.chef.io/attributes.html#whitelist-attributes) to client.rb at bootstrap.
+
+For example, set array to `knife.rb`.
+
+```
+knife[:automatic_attribute_whitelist] = [
+  "fqdn/",
+  "ipaddress/",
+  "roles/",
+  "recipes/",
+  "ipaddress/",
+  "platform/",
+  "platform_version/",
+  "cloud/",
+  "cloud_v2/"
+]
+```
+
+It setting will append to client.rb of node via bootstrap.
+
+```
+...
+
+automatic_attribute_whitelist ["fqdn/", "ipaddress/", "roles/", "recipes/", "ipaddress/", "platform/", "platform_version/", "cloud/", "cloud_v2/"]
+```
+
+It means knife-zero will collects and updates only listed attributes to local file.
+
+```
+{
+  "name": "knife-zero.example.com",
+  "normal": {
+    "tags": [
+
+    ]
+  },
+  "automatic": {
+    "ipaddress": "xxx.xxx.xxx.xxx",
+    "roles": [
+
+    ],
+    "recipes": [
+
+    ],
+    "platform": "ubuntu",
+    "platform_version": "14.04",
+    "cloud_v2": null
+  }
+}  
+```
+
+
 
 ### knife zero converge/chef_client (for update)
 

data/lib/chef/knife/zero_bootstrap.rb

@@ -19,10 +19,13 @@ class Chef
       self.options.delete :node_ssl_verify_mode
       self.options.delete :node_verify_api_cert
 
-      option :without_chef_run,
-        :long => "--without-chef-run",
+      option :bootstrap_converge,
+        :long => "--[no-]converge",
         :description => "Bootstrap without Chef-Client Run.(for only update client.rb)",
-        :boolean => false
+        :boolean => true,
+        :default => true,
+        :proc => lambda { |v| Chef::Config[:knife][:bootstrap_converge] = v }
+
 
       def knife_ssh
         begin

data/lib/knife-zero/core/bootstrap_context.rb

@@ -32,7 +32,7 @@ class Chef
            alias :orig_start_chef start_chef
            def start_chef
              if @chef_config[:knife_zero]
-               unless @config[:without_chef_run]
+               if @config[:bootstrap_converge]
                client_path = @chef_config[:chef_client_path] || 'chef-client'
                s = "#{client_path} -j /etc/chef/first-boot.json"
                s << ' -l debug' if @config[:verbosity] and @config[:verbosity] >= 2
@@ -41,7 +41,7 @@ class Chef
                s << " -W" if @config[:why_run]
                s
                else
-                 "echo Execution of Chef-Client has been canceled due to --without-chef-run."
+                 "echo Execution of Chef-Client has been canceled due to bootstrap_converge if false."
                end
              else
                orig_start_chef

data/lib/knife-zero/version.rb

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

data/test/knife-zero/test_versioin.rb

@@ -2,6 +2,6 @@ require "knife-zero/version"
 
 class TC_Version < Test::Unit::TestCase
   test "returns version correctly" do
-    assert_equal("1.7.0", Knife::Zero::VERSION)
+    assert_equal("1.7.1", Knife::Zero::VERSION)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-zero
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - sawanoboly