knife-zero 2.5.0 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21b9f4e46fa35f2a396bd05638e1a2577e9e52a6802654de1e777794b90be418
-  data.tar.gz: 4413d9cff6fe0276790b9aad1942493d018dc513206d2c03de83e73bb03696d6
+  metadata.gz: 432ac5bd7af8f8aef7d74a88aadb2ed3ec6686765f537857d42b93714bbe55d0
+  data.tar.gz: 3e10697cd00a95823dd3bc7a4f4f74270e8296ec2ca72148ea343d32c1672586
 SHA512:
-  metadata.gz: 35aac693fabbbae93af287068c74abd0d555a9262a190b35e2e01652102099f7121ba03a785b17f2b10707fea3712da64e23111acde42c6519dd144addca962e
-  data.tar.gz: ac9c669a2b71d28e0b3fd2e07451fff65329bb4515942b11e7fc0b1d2373726adb3aee8d45ed9195c3448b94f1e7cdb07900e0c7e4acede2ee4575eed06905b2
+  metadata.gz: 45f3f6874ca9587e016b5afd16c6a76e214a99ca8b0e5b05e9c3a7d87ce1b2a2508e44087fdd6424c0f94ad3da425331d313e2e8decbb5663d4acbfe7aa0cf71
+  data.tar.gz: 4aa6b08829720cdcfd39d33c10177e17301d2c3d2abe3df7c8076141605abff024fe9469580384a2413f0effc55ec637b116d5359fabbba2737497bdc75c2d9e

data/CHANGELOG.md

@@ -4,6 +4,14 @@
 
 none.
 
+## v2.5.2
+
+- Bootstrap: Allow overriding node name for the new node #170 HT [@Spirtulus](https://github.com/Spirtulus)
+
+## v2.5.1
+
+- Put some more Chefutils constants [#169](https://github.com/higanworks/knife-zero/pull/169) HT [@Spirtulus](https://github.com/Spirtulus)
+
 ## v2.5.0
 
 - CINC client bootstrap fix [#168](https://github.com/higanworks/knife-zero/pull/168) HT [@Spirtulus](https://github.com/Spirtulus)

data/lib/chef/knife/zero_converge.rb

@@ -111,12 +111,12 @@ class Chef
 
       def start_chef_client # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize, Metrics/CyclomaticComplexity
         client_path = @config[:use_sudo] || Chef::Config[:knife][:use_sudo] ? 'sudo ' : ''
-        client_path = @config[:chef_client_path] ? "#{client_path}#{@config[:chef_client_path]}" : "#{client_path}chef-client"
+        client_path = @config[:chef_client_path] ? "#{client_path}#{@config[:chef_client_path]}" : "#{client_path}#{ChefUtils::Dist::Infra::CLIENT}"
         s = String.new(client_path)
         s << ' -l debug' if @config[:verbosity] && @config[:verbosity] >= 2
         s << " -S http://127.0.0.1:#{::Knife::Zero::Helper.zero_remote_port}"
         s << " -o #{@config[:override_runlist]}" if @config[:override_runlist]
-        s << ' -j /etc/chef/chef_client_json.json' if @config[:json_attribs]
+        s << ' -j /etc/' + ChefUtils::Dist::Infra::DIR_SUFFIX + '/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]}"

data/lib/knife-zero/bootstrap_ssh.rb

@@ -78,7 +78,7 @@ class Chef
 
       def build_client_json
         <<-SCRIPT
-        sudo sh -c 'cat <<"EOP" > /etc/chef/chef_client_json.json
+        sudo sh -c 'cat <<"EOP" > /etc/#{ChefUtils::Dist::Infra::DIR_SUFFIX}/chef_client_json.json
         #{config[:chef_client_json].to_json}
         '
         SCRIPT

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

@@ -60,6 +60,7 @@ class Chef
                 s << " -S http://127.0.0.1:#{::Knife::Zero::Helper.zero_remote_port}"
                 s << " -K #{[::File.dirname(@config[:node_config_file]), 'validation.pem'].join('/')}"
                 s << ' -W' if @config[:why_run]
+                s << " -N #{@config[:chef_node_name]}" if @config[:chef_node_name]
                 Chef::Log.info 'Remote command: ' + s
                 s
               else

data/lib/knife-zero/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Zero
-    VERSION = '2.5.0'.freeze
+    VERSION = '2.5.2'.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.5.0
+  version: 2.5.2
 platform: ruby
 authors:
 - sawanoboly
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-19 00:00:00.000000000 Z
+date: 2023-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Run chef-client at remote node with chef-zero(local-mode) via HTTP over SSH