knife-zero 1.8.7 → 1.9.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23d02b4ab827fdc2d4b0a9b82e30177b0694a9f2
-  data.tar.gz: 9428d56194ca579503718e9517f4dbd9b696dac7
+  metadata.gz: c2c620c6d5a45dcd31d20e1ad79a5aad1bef3eb3
+  data.tar.gz: 5025abfbbab7bb134613ee7322853db13661b777
 SHA512:
-  metadata.gz: cab667682f056eb055fa6cf1a464f70da24dc935f6bcc253121d9b3072dccf26e4f8e0e13463954da39876c5a8206778d306cb75bdd0329bac19efea11fde950
-  data.tar.gz: 08ef833e2df63ac66064974bba5ab50320d3449b9050df2b237656294e8bfd2f6955428f6e470255c1fe5d40dbdb6610f68142dec433f53d6b66299b46680442
+  metadata.gz: ca4447936565588d7d77c6b21db8bd23295af94e2622116aad2a74154efb2ebd4fc4bd14dc373b303b6ccd3d57923699b6f9eacaec406a8b3f2e1c1bebc701e4
+  data.tar.gz: 2a5f49c88167802ffc2321ae3bbe539734b73237e39fa5634ba63776745eced1a7e71a39f0fe91820fdb0edaafd5d9f5e4b194463467bb5aeca7771c28d3ff61

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## v1.9.0
+
+- Change: use nil to ssh_user on bootstraping by default.
+    - compatibility for 12.5 and ssh/config
+- Remove: add new attribute knife_zero.ssh_url at bootstrap.
+
 ## v1.8.7
 
 - Follow master: environment _default is not set by default since 12.5

data/README.md

@@ -40,283 +40,25 @@ knife zero diagnose # show configuration from file
 
 ### Configuration file
 
-You need to make sure the knife.rb file in your chef-repo (in the chef-repo root or .chef directory) is adapted to use chef-zero.
+Relocated: [Configration | Knife-Zero Document](http://knife-zero.github.io/40_configration/)
 
-For example, at `.chef/knife.rb`. At least the following contents are needed:
-```
-chef_repo_path   File.expand_path('../../' , __FILE__)
-cookbook_path    [File.expand_path('../../cookbooks' , __FILE__), File.expand_path('../../site-cookbooks' , __FILE__)]
-```
-
-If you used knife serve or knife zero, this makes sure chef-zero is started with the contents of the chef-repo directory instead of as an empty server.
-
-### knife zero bootstrap
-
-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 Bootstrap without first Chef-Client Run.(--no-converge).
-
-#### Example
-
-Bootstrap with run-list.
-
-```
-$ bundle exec knife zero bootstrap host.example.com -r hogehoge::default --no-host-key-verify
-Connecting to host.example.com
-host.example.com Installing Chef Client...
--- snip --
-host.example.com Thank you for installing Chef!
+### knife zero bootstrap | converge | diagnose
 
-host.example.com Starting first Chef Client run...
-host.example.com Starting Chef Client, version 11.14.6
-host.example.com Creating a new client identity for host.example.com using the validator key.
+Relocated
 
+- [Getting Started | Knife-Zero Document](http://knife-zero.github.io/20_getting_started/)
+- [Subcommands | Knife-Zero Document](http://knife-zero.github.io/30_subcommands/)
 
-## Resolve and sync cookbook via http over ssh tcp-forward by run-list.
-host.example.com resolving cookbooks for run list: ["hogehoge::default"]
-host.example.com Synchronizing Cookbooks:
-host.example.com   - hogehoge
-host.example.com Compiling Cookbooks...
-host.example.com Converging 0 resources
-host.example.com 
-host.example.com Running handlers:
-host.example.com Running handlers complete
-host.example.com Chef Client finished, 0/0 resources updated in 4.895561879 seconds
-
-
-## Creates node object into local.
- $ ls nodes/host.example.com.json 
-nodes/host.example.com.json
-host.example.com
-
-## Search by knife with --local--mode option.
-$ bundle exec knife search node --local-mode
-1 items found
-
-Node Name:   host.example.com
-Environment: _default
-FQDN:        
-IP:          xxx.xxx.xxx.xxx
-Run List:    recipe[hogehoge::default]
-Roles:       
-Recipes:     hogehoge::default
-Platform:    ubuntu 12.04
-Tags:        
-```
-
-Search and execute command via ssh by knife ssh.
-
-```
-$ knife ssh 'hostname:*' --local-mode uptime --attribute ipaddress 
-xxx.xxx.xxx.xxx  08:41:36 up  1:03,  1 user,  load average: 0.00, 0.01, 0.01
-xxx.xxx.xxx.xxx  08:41:37 up 143 days,  2:32,  4 users,  load average: 0.00, 0.01, 0.05
-```
-
-Bootstrap multi-nodes via GNU Parallel
-
-```
-$ parallel -j 5 ./bin/knife zero bootstrap ::: nodeA nodeB nodeC...
-```
 
 #### (Hint)Supress Automatic Attributes
 
-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`.
-
-```
-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": {
-    "knife_zero" : {
-      "host" : "xxx.xxx.xxx.xxx(bootstraped_target)"
-    },
-    "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)
-
-`knife zero converge QUERY (options)`
-`knife zero chef_client QUERY (options) | It's same as converge`
-
-Search nodes from local chef-repo directory, and run chef-client at remote node.
-
-Supported options are mostly the same as `knife ssh`.
-And it supports below.
-
-- why-run(`-W, --why-run`)
-- Override run-list(`-o RunlistItem,RunlistItem, --override-runlist`). It skips save node.json on workstation.
-
-#### Example
-
-```
-## Chef-Repo has two nodes
-$ knife node list --local-mode
-host.example.com
-host2.example.com
-
-## add recipe to run_list of host.example.com
-$ knife node run_list add host.example.com hogehoge::default --local-mode
-host.example.com:
-  run_list: recipe[hogehoge::default]
-
-
-$ knife zero converge 'name:*' --attribute ipaddress 
-
-## host.example.com was converged by run_list.
-host.example.com Starting Chef Client, version 11.14.6
-host.example.com resolving cookbooks for run list: ["hogehoge::default"]
-host.example.com Synchronizing Cookbooks:
-host.example.com   - hogehoge
-host.example.com Compiling Cookbooks...
-host.example.com Converging 0 resources
-host.example.com 
-host.example.com Running handlers:
-host.example.com Running handlers complete
-host.example.com Chef Client finished, 0/0 resources updated in 3.112708185 seconds
-
-
-## host2.example.com has no run_list.
-host2.example.com Starting Chef Client, version 11.14.2
-host2.example.com resolving cookbooks for run list: []
-host2.example.com Synchronizing Cookbooks:
-host2.example.com Compiling Cookbooks...
-host2.example.com [2014-08-24T11:52:15+00:00] WARN: Node ngrok01.xenzai.net has an empty run list.
-host2.example.com Converging 0 resources
-host2.example.com 
-host2.example.com Running handlers:
-host2.example.com Running handlers complete
-host2.example.com Chef Client finished, 0/0 resources updated in 3.729471856 seconds
-```
-
-
-## Sample Workflow
-
-1. create chef-repo directory.
-1. bundle init and add below.
-    - `gem 'chef'  `
-    - `gem 'knife-zero'`
-    - and cookbook management tool such as `Berkshelf` or `Librarian-Chef`.
-1. bundle   
-e.g.) `bundle install --path vendor/bundle --binstubs`
-1.  install cookbooks to `./cookbooks`. (if you need run recipe.)
-1. bootstrap on remote node.  
-`./bin/knife zero bootstrap host.example.com [-r "${your-run-list}"]`
-1. chef-client will run using resources on local chef-repo.
-
-### Need test on Vagrant ?
-
-Relocated: [Practice with Vagrant | Knife-Zero Document](https://knife-zero.github.io/tips/practice_with_vagrant/)
-
-
-## Debug for Configuration
-
-`knife zero diagnose` shows configuration from file(Such as knife.rb).
-
-```
-$ knife zero diagnose
-
-Chef::Config
-====================
----
-:local_mode: true
-:verbosity: 
-:config_file: "/Users/sawanoboriyu/github/higanworks/knife-zero_playground/knife.rb"
-:color: true
-:log_level: :error
-:chef_repo_path: "/Users/sawanoboriyu/github/higanworks/knife-zero_playground"
-:log_location: !ruby/object:IO {}
-:chef_server_url: http://localhost:8889
-:repo_mode: everything
-
-Knife::Config
-====================
----
-:verbosity: 0
-:color: true
-:editor: vim
-:disable_editing: false
-:format: summary
-:ssh_user: root
-:host_key_verify: true
-:config_file: "/Users/sawanoboriyu/github/higanworks/knife-zero_playground/knife.rb"
-
-Zero Bootstrap Config
-====================
----
-:ssh_user: root
-:host_key_verify: true
-:distro: chef-full-localmode
-:template_file: false
-:run_list: []
-:first_boot_attributes: {}
-
-Zero ChefClient Config
-====================
----
-:ssh_user: root
-:host_key_verify: true
-:concurrency: 
-:override_runlist: 
-```
+Relocated: [Configration | Knife-Zero Document](http://knife-zero.github.io/40_configration/)
 
 
 ## To include from other knife plugins
 
-If you want to integrate knife-zero on machine creation with cloud plugins, you can add zerobootstrap to deps like below.
-
-```
-deps do
-  require 'chef/knife/zerobootstrap'
-  Chef::Knife::ZeroBootstrap.load_deps
-  self.options = Chef::Knife::ZeroBootstrap.options.merge(self.options)
-end
-```
+Relocated: [To include from other knife plugins | Knife-Zero Document](http://knife-zero.github.io/tips/include_from_other_knife_plugins/)
 
-For example, [knife-digital_ocean](https://github.com/higanworks/knife-digital_ocean/blob/79_merge_zero_bootstrap_options/lib/chef/knife/digital_ocean_droplet_create.rb)
 
 ## Contributing
 

data/lib/chef/knife/zero_bootstrap.rb

@@ -19,6 +19,11 @@ class Chef
       self.options.delete :node_ssl_verify_mode
       self.options.delete :node_verify_api_cert
 
+      ## Override to use nil by default
+      option :ssh_user,
+        :short => "-x USERNAME",
+        :long => "--ssh-user USERNAME"
+
       option :bootstrap_converge,
         :long => "--[no-]converge",
         :description => "Bootstrap without Chef-Client Run.(for only update client.rb)",
@@ -80,17 +85,18 @@ 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
+## Return to Pending.
+#         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,
-          ssh_url: ssh_url
+          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.7"
+    VERSION = "1.9.0.pre.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.7
+  version: 1.9.0.pre.1
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-05 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -186,9 +186,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8