knife-zero 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f1cd2562eb42faa227a762c0fae1ab59bb7f5c0c357e6c53b75d4c35546fc3b
-  data.tar.gz: be6e7409ad03494cb2fd204f788221331bb7cef7e3054fe7e910c4da1b45773e
+  metadata.gz: 0d05862dc7246e728f58b0bda336b60417415d10668a16fad81c7efc0ee5cd61
+  data.tar.gz: 87ba092f340f8ffcdd95202cfa217138cb9acd06ed31b7601ffc4151a835997c
 SHA512:
-  metadata.gz: 34644654c493967891415dceb6f88ec0bb437b4abebbb540121969aa2e992d81877270d3a372cff002d8e8556666c24cbf4c5405e8822167d47d7142d0779cc2
-  data.tar.gz: 7453c885179051ad941aad30c214f1d5b0bf2b50b42276b92a251560ca63f831fe7b16c568e2787f475908a689144e092a73dbec01cc1538ab6ae4376817df61
+  metadata.gz: b5e198e21398ade07a5bef9d11381a4900d886078748d155fc90d262bc540b24453dcc4985afc4d0d51de6e9185bce5a7471dd0666b67d01768a8662ce38015f
+  data.tar.gz: 9b38e4d64ef1a2e85bba7535ac23be86e1e9d805d637cbbc4026d579dd5e3b103ac00a1320d7d2da99022081a637ceada9b476ff7260da47a4064fb7bce90308

data/CHANGELOG.md

@@ -4,6 +4,15 @@
 
 none.
 
+## v2.2.0
+
+- add `--alter-project` to support cinc [#133]
+  - allowed values: 'chef' or 'cinc'
+  - in config => `knife[:alter_project]`
+- relocate `--node-config` option from `zero converge` to both `zero converge` and `zero bootstrap`.
+- remove `-N` for `--node-config` short option.
+  - (Duplicate with NAME option)
+
 ## v2.1.0
 
 - Allow pass run-list and environments from json-attributes.

data/README.md

@@ -50,7 +50,7 @@ knife zero diagnose # show configuration from file
 
 ### Configuration file
 
-Relocated: [Configration | Knife-Zero Document](http://knife-zero.github.io/40_configuration/)
+Relocated: [Configuration | Knife-Zero Document](http://knife-zero.github.io/40_configuration/)
 
 ### knife zero bootstrap | converge | diagnose
 
@@ -60,9 +60,9 @@ Relocated
 - [Subcommands | Knife-Zero Document](http://knife-zero.github.io/30_subcommands/)
 
 
-#### (Hint)Supress Automatic Attributes
+#### (Hint)Suppress Automatic Attributes
 
-Relocated: [Configration | Knife-Zero Document](http://knife-zero.github.io/40_configration/)
+Relocated: [Configuration | Knife-Zero Document](http://knife-zero.github.io/40_configuration/)
 
 
 ## To include from other knife plugins

data/lib/chef/knife/zero_base.rb

@@ -28,6 +28,19 @@ class Chef
                  description: 'Listen port on remote',
                  default: nil,
                  proc: proc { |key| Chef::Config[:remote_chef_zero_port] = key.to_i }
+
+          option :alter_project,
+                 long: '--alter-project PROJECT',
+                 proc: proc { |u| Chef::Config[:alter_project] = u },
+                 description: 'Products used on remote nodes',
+                 default: 'chef',
+                 in: %w{chef cinc}
+
+          option :node_config_file,
+                 long: '--node-config PATH_TO_CONFIG',
+                 proc: proc { |u| Chef::Config[:node_config_file] = u },
+                 description: 'The configuration file to use on remote node',
+                 default: '/etc/chef/client.rb'
         end
       end
 

data/lib/chef/knife/zero_bootstrap.rb

@@ -54,6 +54,11 @@ class Chef
           )
         end
 
+        case @config[:alter_project]
+        when 'cinc'
+          Chef::Config[:knife][:bootstrap_url] = 'https://omnitruck.cinc.sh/install.sh'
+        end
+
         if @config[:bootstrap_converge]
           unless @config[:overwrite_node_object]
             q = Chef::Search::Query.new

data/lib/chef/knife/zero_converge.rb

@@ -36,11 +36,6 @@ class Chef
         self.options[:skip_cookbook_sync] = Chef::Application::Client.options[:skip_cookbook_sync]
       end
 
-      option :node_config_file,
-             short: '-N PATH_TO_CONFIG',
-             long: '--node-config PATH_TO_CONFIG',
-             description: 'The configuration file to use on remote node'
-
       option :splay,
              long: '--splay SECONDS',
              description: 'The splay time for running at intervals, in seconds',
@@ -124,7 +119,7 @@ class Chef
         s << ' -j /etc/chef/chef_client_json.json' if @config[:json_attribs]
         s << " --splay #{@config[:splay]}" if @config[:splay]
         s << " -n #{@config[:named_run_list]}" if @config[:named_run_list]
-        s << " --config #{@config[:node_config_file]}" if @config[:node_config_file]
+        s << " --config #{@config[:node_config_file]}"
         s << ' --skip-cookbook-sync' if @config[:skip_cookbook_sync]
         s << ' --no-color' unless @config[:color]
         s << " -E #{@config[:environment]}" if @config[:environment]

data/lib/knife-zero/bootstrap_ssh.rb

@@ -11,7 +11,12 @@ class Chef
 
       def ssh_command(command, subsession = nil) # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize, Metrics/CyclomaticComplexity
         if config[:client_version]
-          super(%{/opt/chef/embedded/bin/ruby -ropen-uri -e 'puts open("https://omnitruck.chef.io/install.sh").read' | sudo sh -s -- -v #{config[:client_version]}})
+          case @config[:alter_project]
+          when 'cinc'
+            super(%{/opt/cinc/embedded/bin/ruby -ropen-uri -e 'puts open("https://omnitruck.cinc.sh/install.sh").read' | sudo sh -s -- -v #{config[:client_version]}})
+          else
+            super(%{/opt/chef/embedded/bin/ruby -ropen-uri -e 'puts open("https://omnitruck.chef.io/chef/install.sh").read' | sudo sh -s -- -v #{config[:client_version]}})
+          end
         end
 
         if config[:json_attribs]

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

@@ -52,6 +52,7 @@ class Chef
                 client_path = @chef_config[:chef_client_path] || 'chef-client'
                 s = String.new("#{client_path} -j /etc/chef/first-boot.json")
                 s << ' -l debug' if @config[:verbosity] && @config[:verbosity] >= 2
+                s << " --config #{@config[:node_config_file]}"
                 s << " -E #{bootstrap_environment}" unless bootstrap_environment.nil?
                 s << " -S http://127.0.0.1:#{::Knife::Zero::Helper.zero_remote_port}"
                 s << ' -W' if @config[:why_run]

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = '2.1.0'.freeze
+    VERSION = '2.2.0'.freeze
     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: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2019-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH