knife-zero 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdf0989e9de6228b25f20b31a9ec5d39255360d6
-  data.tar.gz: e6c149cefe11911ff06ab5e2b5f03e114ab69d06
+  metadata.gz: e39c13ccfb06700b75faf777b099918ce95faacd
+  data.tar.gz: a944aa77a0e4642586f929510ce70c59b765a1a4
 SHA512:
-  metadata.gz: e902a417918ddd8eb00c2461c75f7b68e69034ff4375224a1fb10fd3f03fb4f7db211d64d3d49bd99be6b40855744e8ed4d3c40344523932cbe4e078ad502e10
-  data.tar.gz: 19f63fd413efba43e48ddd10189046ffda6ea4b506063df448a0d8514274c00f9fcf29d3f90f7ae557e7b5b2656b23ac552b7ba5054fc9ba7857fe92b2bc4816
+  metadata.gz: db8c52fa6822403387d8cd0c4529eb0977a908b4c691ca8c41a62c35f567d5237e938b0407721cc9a4dadcf04230a106912ccf73aa6ec9bc25191abbc432ba8f
+  data.tar.gz: 6ede3e035a21562fe1b3730053f6e18397628ebf52f647896ef107cc687e7c46d3c822b8fd321db8c188a57fa035dda05f589a37f8efe02c7d2ff937d8b767ae

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## v1.8.1
+
+- Follow Chef: check first_boot_attribute_from_file flag for knife_zero.host attribute(normal).
+
 ## v1.8.0
 
 - Feature: set bootstraped host to knife_zero.host attribute(normal) #57

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 sawanoboly@higanworks.com
+Copyright (c) 2014-2015 sawanoboly@higanworks.com
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -16,7 +16,7 @@ Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH port
 - It supports all functions of chef(C/S).
 - You have only to manage one chef-repo.
 
-[Knife-Zero Document](http://higanworks.com/knife-zero/)(WIP)
+[Knife-Zero Document](https://knife-zero.github.io)(WIP)
 
 ## Requirements
 
@@ -137,7 +137,7 @@ $ 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.
+knife-zero supports appending [whitelist-attributes](https://docs.chef.io/attributes.html#whitelist-attributes) to client.rb at bootstrap.
 
 For example, set array to `knife.rb`.
 
@@ -169,6 +169,9 @@ It means knife-zero will collects and updates only listed attributes to local fi
 {
   "name": "knife-zero.example.com",
   "normal": {
+    "knife_zero" : {
+      "host" : "xxx.xxx.xxx.xxx(bootstraped_target)"
+    },
     "tags": [
 
     ]
@@ -341,7 +344,7 @@ WARN: No cookbooks directory found at or above current directory.  Assuming /Use
 ...
 ```
 
-#### Case: Set specific attribute for ssh
+#### Case: Use network specific attribute
 
 Bootstrap with ssh options and `--sudo` to host-only address. 
 
@@ -362,38 +365,12 @@ Connecting to 192.168.33.10
 ...
 ```
 
-You can see node which was bootstrapped at list.
+The knife-zero creates `node.knife_zero.host` attribute when bootstrap.
 
-```
-$ knife node list
-
-vagrant.vm
-```
-
-Set unique attribute to node by `node edit`, such as `chef_ip`.
-
-```
-$ knife node edit vagrant.vm
-{
-  "name": "vagrant.vm",
-  "chef_environment": "_default",
-  "normal": {
-    "chef_ip" : "192.168.33.10",
-    "tags": [
-
-    ]   
-  },  
-  "run_list": [
-
-]
+Run zero converge with `-a knife_zero.host` option.
 
-}
 ```
-
-Run zero converge with `-a chef_ip` option. 
-
-```
-$ ./bin/knife zero converge "name:vagrant.vm" -x vagrant -i ./.vagrant/machines/default/virtualbox/private_key --sudo -a chef_ip 
+$ ./bin/knife zero converge "name:vagrant.vm" -x vagrant -i ./.vagrant/machines/default/virtualbox/private_key --sudo -a knife_zero.host
 
 192.168.33.10 Starting Chef Client, version 12.0.3
 192.168.33.10 resolving cookbooks for run list: []
@@ -407,17 +384,6 @@ $ ./bin/knife zero converge "name:vagrant.vm" -x vagrant -i ./.vagrant/machines/
 192.168.33.10 Chef Client finished, 0/0 resources updated in 6.245413202 seconds
 ```
 
-#### Case: don't use name or specific attribute..?
-
-For example, you can use ipv4 of eth1(or others) like below.
-
-```
-$ knife zero converge "name:*" -x vagrant -i ./.vagrant/machines/default/virtualbox/private_key --sudo -a network.interfaces.eth1.addresses.keys.rotate.first
-
-192.168.33.10 Starting Chef Client, version 12.0.3
-192.168.33.10 resolving cookbooks for run list: []
-```
-
 ## Debug for Configuration
 
 `knife zero diagnose` shows configuration from file(Such as knife.rb).

data/lib/chef/knife/zero_bootstrap.rb

@@ -27,7 +27,11 @@ class Chef
         :proc => lambda { |v| Chef::Config[:knife][:bootstrap_converge] = v }
 
       def run
-        @config[:first_boot_attributes] = @config[:first_boot_attributes].merge(build_knifezero_attributes_for_node)
+        if @config[:first_boot_attributes_from_file]
+          @config[:first_boot_attributes_from_file] = @config[:first_boot_attributes_from_file].merge(build_knifezero_attributes_for_node)
+        else
+          @config[:first_boot_attributes] = @config[:first_boot_attributes].merge(build_knifezero_attributes_for_node)
+        end
         super
       end
 

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = "1.8.0"
+    VERSION = "1.8.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.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler