knife-zero 1.8.5 → 1.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b237a684fc97894a3527039f348625f4834dd4d
-  data.tar.gz: c125782b3e8a883d8792608bfaff70173bcd21ad
+  metadata.gz: 11563bfb7405a0e1b1ecc2e77b173d3cc8c14838
+  data.tar.gz: 26a8138040e088c18a3d5f3c118a9594419e9bc1
 SHA512:
-  metadata.gz: 047c70e46a47bc6c57c814adcf82f597e72b28f3de214d41292d98ebdc7c59d3581c82b590b9f5e7f8473c94613a5186923e3c45b5d39ea011a479da594aeb6d
-  data.tar.gz: ef654a7a9a85090a64aae02096a9e35e59dfb18f78403d6f81c3396fba460368e7cf6c60519b119d9728b843c3e621e477063b149dbfcb478e608e4a98b7f84e
+  metadata.gz: 25695cdf6be7cb4754c0a686f00e36c20dc54d4f7b2ea64381070994ef358069f7e145660ea2aa1af63563a52ab3d11daa1ec6fac566839afeef0ad5ee7e11c8
+  data.tar.gz: e4edf70d45cbf1315e0d0e19bc9584b17bb5430744f20b28c285d86ea60a818fa9d3868a00047b44e51940f944a8ca37ace44fb019d5b250d8aa31cf0d0a824b

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## v1.8.6
+
+- Feature: add new attribute knife_zero.ssh_url at bootstrap.
+
 ## v1.8.5
 
 - Bug: allow more than 2 white lists. HT: @kaznishi

data/README.md

@@ -16,7 +16,8 @@ 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](https://knife-zero.github.io)(WIP)
+- [Knife-Zero Document](https://knife-zero.github.io)
+- [Knife-Zero Document(Ja)](https://knife-zero.github.io/ja/)
 
 ## Requirements
 
@@ -24,25 +25,8 @@ Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH port
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Relocated: [Installation | Knife-Zero Document](http://knife-zero.github.io/10_install/)
 
-    gem 'knife-zero'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install knife-zero
-
-### With Chef-DK
-
-Install via `chef gem` subcommand.
-
-```
-$ chef gem install knife-zero
-```
 
 ## Usage
 
@@ -265,124 +249,8 @@ e.g.) `bundle install --path vendor/bundle --binstubs`
 
 ### Need test on Vagrant ?
 
-You can test cookbooks easily by Test-Kitchen before manage remote nodes instead of using knife-zero for vagrant VM.
-
-See [Getting Started knife-zero with test-kitchen](https://github.com/higanworks/knife-zero-with-kitchen).
-
-### Or, Try knife-zero simply with Vagrant.
-
-> **For Your Information** :  
-> If only you want to try `chef-zero` or `chef-client localmode` (For instance: migrate from chef-solo), You should use [chef-zero provisioner(Vagrant)](http://docs.vagrantup.com/v2/provisioning/chef_zero.html) with vagrant.
-> The knife-zero will provides similar usage with the chef-zero provisioner on vagrant, but for remote node.
-
-Set local_mode as default to `knife.rb`.
-
-```
-$ echo 'local_mode true' >> knife.rb
-```
-
-Add host-only network to vagrant vm(strongly recommended).
-
-```
-Vagrant.configure(2) do |config|
-  config.vm.box = "opscode-ubuntu-14.04"
-  config.vm.network "private_network", ip: "192.168.33.10"
-end
-```
-
-
-Retrieve ssh-config.
-
-```
-$ vagrant up
-$ vagrant ssh-config
-Host default
-  HostName 127.0.0.1
-  User vagrant
-  Port 2201
-  UserKnownHostsFile /dev/null
-  StrictHostKeyChecking no
-  PasswordAuthentication no
-  IdentityFile /Users/sawanoboriyu/worktemp/knife-zero-vagrant/.vagrant/machines/default/virtualbox/private_key
-  IdentitiesOnly yes
-  LogLevel FATAL
-```
-
-#### Case: Use name as address for ssh
+Relocated: [Practice with Vagrant | Knife-Zero Document](https://knife-zero.github.io/tips/practice_with_vagrant/)
 
-Bootstrap with ssh options and `--sudo` to host-only address. And set ipaddress to name with `-N` option.
-
-```
-$ ./bin/knife zero bootstrap 192.168.33.10 -i ./.vagrant/machines/default/virtualbox/private_key -N 192.168.33.10 -x vagrant --sudo
-
-WARN: No cookbooks directory found at or above current directory.  Assuming /Users/sawanoboriyu/worktemp/knife-zero-vagrant.
-Connecting to 192.168.33.10
-192.168.33.10 Installing Chef Client...
-
-...
-```
-
-Run zero converge with `-a name` option.
-
-> Caution: `-a(--attribute) name` option doesn't work since chef 12.1.0.
-> Please use specific attribute until fix it.
-> I've already create PR for fix. Please wait for merge to use name attribute. https://github.com/chef/chef/pull/3195
-
-```
-$ knife zero converge "name:*" -x vagrant -i ./.vagrant/machines/default/virtualbox/private_key --sudo -a name
-WARN: No cookbooks directory found at or above current directory.  Assuming /Users/sawanoboriyu/worktemp/knife-zero-vagrant.
-192.168.33.10 Starting Chef Client, version 12.0.3
-192.168.33.10 resolving cookbooks for run list: []
-192.168.33.10 Synchronizing Cookbooks:
-192.168.33.10 Compiling Cookbooks...
-192.168.33.10 [2015-02-04T04:08:04+00:00] WARN: Node 192.168.33.10 has an empty run list.
-192.168.33.10 Converging 0 resources
-192.168.33.10 
-192.168.33.10 Running handlers:
-192.168.33.10 Running handlers complete
-192.168.33.10 Chef Client finished, 0/0 resources updated in 6.571334535 seconds
-...
-```
-
-#### Case: Use network specific attribute
-
-Bootstrap with ssh options and `--sudo` to host-only address. 
-
-```
-$ knife zero bootstrap 192.168.33.10 -i ./.vagrant/machines/default/virtualbox/private_key -x vagrant --sudo
-
-WARN: No cookbooks directory found at or above current directory.  Assuming /Users/sawanoboriyu/worktemp/knife-zero-vagrant.
-Connecting to 192.168.33.10
-192.168.33.10 Installing Chef Client...
-192.168.33.10 --2015-02-03 16:44:56--  https://www.opscode.com/chef/install.sh
-192.168.33.10 Resolving www.opscode.com (www.opscode.com)... 184.106.28.91
-192.168.33.10 Connecting to www.opscode.com (www.opscode.com)|184.106.28.91|:443... connected.
-192.168.33.10 HTTP request sent, awaiting response... 200 OK
-192.168.33.10 Length: 18285 (18K) [application/x-sh]
-192.168.33.10 Saving to: ‘STDOUT’
-192.168.33.10 
-100%[======================================>] 18,285      --.-K/s   in 0.002s  
-...
-```
-
-The knife-zero creates `node.knife_zero.host` attribute when bootstrap.
-
-Run zero converge with `-a knife_zero.host` option.
-
-```
-$ ./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: []
-192.168.33.10 Synchronizing Cookbooks:
-192.168.33.10 Compiling Cookbooks...
-192.168.33.10 [2015-02-03T17:03:37+00:00] WARN: Node vagrant.vm has an empty run list.
-192.168.33.10 Converging 0 resources
-192.168.33.10 
-192.168.33.10 Running handlers:
-192.168.33.10 Running handlers complete
-192.168.33.10 Chef Client finished, 0/0 resources updated in 6.245413202 seconds
-```
 
 ## Debug for Configuration
 

data/knife-zero.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["sawanoboriyu@higanworks.com"]
   spec.summary       = %q{Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH port fowarding.}
   spec.description   = %q{Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH port fowarding.}
-  spec.homepage      = ""
+  spec.homepage      = "http://knife-zero.github.io"
   spec.license       = "Apache2"
 
   spec.files         = Dir['README.md','CHANGELOG.md','knife-zero.gemspec','lib/**/*']

data/lib/chef/knife/zero_bootstrap.rb

@@ -80,9 +80,17 @@ class Chef
       end
 
       def build_knifezero_attributes_for_node
+        ssh_url = String.new("ssh://")
+        ssh_url << config[:ssh_user] || Chef::Config[:knife][:ssh_user]
+        ssh_url << "@"
+        ssh_url << server_name
+        ssh_url << ":"
+        port =  config[:ssh_port] || Chef::Config[:knife][:ssh_port] || 22
+        ssh_url << port.to_s
         attr = Mash.new
         attr[:knife_zero] = {
-          host: server_name
+          host: server_name,
+          ssh_url: ssh_url
         }
         attr
       end

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = "1.8.5"
+    VERSION = "1.8.6"
     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.5
+  version: 1.8.6
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -171,7 +171,7 @@ files:
 - lib/knife-zero/helper.rb
 - lib/knife-zero/net-ssh-multi-patch.rb
 - lib/knife-zero/version.rb
-homepage: ''
+homepage: http://knife-zero.github.io
 licenses:
 - Apache2
 metadata: {}