diff options
-rw-r--r-- | CHANGELOG.md | 7 | ||||
-rw-r--r-- | Gemfile.lock | 22 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | chef-bin/lib/chef-bin/version.rb | 2 | ||||
-rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
-rw-r--r-- | chef-utils/lib/chef-utils/version.rb | 2 | ||||
-rw-r--r-- | kitchen-tests/kitchen.yml | 2 | ||||
-rw-r--r-- | knife/lib/chef/knife/bootstrap.rb | 2 | ||||
-rw-r--r-- | knife/lib/chef/knife/version.rb | 2 | ||||
-rw-r--r-- | knife/spec/unit/knife/bootstrap_spec.rb | 20 | ||||
-rw-r--r-- | lib/chef/version.rb | 2 |
11 files changed, 33 insertions, 32 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4242164271..1b59ee3d0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,18 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> This changelog lists individual merged pull requests to Chef Infra Client and geared towards developers. For a list of significant changes per release see the [Chef Infra Client Release Notes](https://docs.chef.io/release_notes_client/). -<!-- latest_release 17.9.3 --> -## [v17.9.3](https://github.com/chef/chef/tree/v17.9.3) (2021-12-14) +<!-- latest_release 17.9.4 --> +## [v17.9.4](https://github.com/chef/chef/tree/v17.9.4) (2021-12-14) #### Merged Pull Requests -- Add helpers to detect VMware desktop vs server platforms [#12358](https://github.com/chef/chef/pull/12358) ([tecracer-theinen](https://github.com/tecracer-theinen)) +- fix knife bootstrap issue when max wait is specified ref#12281 [#12338](https://github.com/chef/chef/pull/12338) ([kasif-adnan](https://github.com/kasif-adnan)) <!-- latest_release --> <!-- release_rollup since=17.8.25 --> ### Changes not yet released to stable #### Merged Pull Requests +- fix knife bootstrap issue when max wait is specified ref#12281 [#12338](https://github.com/chef/chef/pull/12338) ([kasif-adnan](https://github.com/kasif-adnan)) <!-- 17.9.4 --> - Add helpers to detect VMware desktop vs server platforms [#12358](https://github.com/chef/chef/pull/12358) ([tecracer-theinen](https://github.com/tecracer-theinen)) <!-- 17.9.3 --> - Update for the new downloads site [#12361](https://github.com/chef/chef/pull/12361) ([tas50](https://github.com/tas50)) <!-- 17.9.2 --> - Setup auto issue labeler for docs [#12370](https://github.com/chef/chef/pull/12370) ([tas50](https://github.com/tas50)) <!-- 17.9.1 --> diff --git a/Gemfile.lock b/Gemfile.lock index 30d83fe2c6..02f0c1b6bf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,12 +35,12 @@ GIT PATH remote: . specs: - chef (17.9.3) + chef (17.9.4) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 17.9.3) - chef-utils (= 17.9.3) + chef-config (= 17.9.4) + chef-utils (= 17.9.4) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) @@ -66,12 +66,12 @@ PATH train-winrm (>= 0.2.5) uuidtools (>= 2.1.5, < 3.0) vault (~> 0.16) - chef (17.9.3-universal-mingw32) + chef (17.9.4-universal-mingw32) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 17.9.3) - chef-utils (= 17.9.3) + chef-config (= 17.9.4) + chef-utils (= 17.9.4) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) @@ -112,15 +112,15 @@ PATH PATH remote: chef-bin specs: - chef-bin (17.9.3) - chef (= 17.9.3) + chef-bin (17.9.4) + chef (= 17.9.4) PATH remote: chef-config specs: - chef-config (17.9.3) + chef-config (17.9.4) addressable - chef-utils (= 17.9.3) + chef-utils (= 17.9.4) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -129,7 +129,7 @@ PATH PATH remote: chef-utils specs: - chef-utils (17.9.3) + chef-utils (17.9.4) concurrent-ruby GEM @@ -1 +1 @@ -17.9.3
\ No newline at end of file +17.9.4
\ No newline at end of file diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb index 0e80177b78..468eca4174 100644 --- a/chef-bin/lib/chef-bin/version.rb +++ b/chef-bin/lib/chef-bin/version.rb @@ -21,7 +21,7 @@ module ChefBin CHEFBIN_ROOT = File.expand_path("..", __dir__) - VERSION = "17.9.3".freeze + VERSION = "17.9.4".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 9bf5cd6c0f..fc33f7ce35 100644 --- a/chef-config/lib/chef-config/version.rb +++ b/chef-config/lib/chef-config/version.rb @@ -15,5 +15,5 @@ module ChefConfig CHEFCONFIG_ROOT = File.expand_path("..", __dir__) - VERSION = "17.9.3".freeze + VERSION = "17.9.4".freeze end diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb index 6c9fe5d554..009865304b 100644 --- a/chef-utils/lib/chef-utils/version.rb +++ b/chef-utils/lib/chef-utils/version.rb @@ -16,5 +16,5 @@ module ChefUtils CHEFUTILS_ROOT = File.expand_path("..", __dir__) - VERSION = "17.9.3" + VERSION = "17.9.4" end diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml index 4d13f2835f..b42342b5a1 100644 --- a/kitchen-tests/kitchen.yml +++ b/kitchen-tests/kitchen.yml @@ -146,7 +146,7 @@ platforms: - name: opensuse-leap-15 driver: image: dokken/opensuse-leap-15 - pid_one_command: /bin/systemd + pid_one_command: /usr/lib/systemd/systemd intermediate_instructions: - RUN /usr/bin/zypper --non-interactive update - RUN /usr/bin/zypper --non-interactive install net-tools-deprecated # we need this for /etc/network/interfaces & ifconfig resource testing diff --git a/knife/lib/chef/knife/bootstrap.rb b/knife/lib/chef/knife/bootstrap.rb index d6687d8161..8909abd45b 100644 --- a/knife/lib/chef/knife/bootstrap.rb +++ b/knife/lib/chef/knife/bootstrap.rb @@ -930,7 +930,7 @@ class Chef opts[:logger] = Chef::Log opts[:password] = config[:connection_password] if config.key?(:connection_password) opts[:user] = user if user - opts[:max_wait_until_ready] = config[:max_wait].to_f unless config[:max_wait].nil? + opts[:max_wait_until_ready] = config[:max_wait].to_i unless config[:max_wait].nil? # TODO - when would we need to provide rdp_port vs port? Or are they not mutually exclusive? opts[:port] = port if port end diff --git a/knife/lib/chef/knife/version.rb b/knife/lib/chef/knife/version.rb index 688076273c..0de749509d 100644 --- a/knife/lib/chef/knife/version.rb +++ b/knife/lib/chef/knife/version.rb @@ -17,7 +17,7 @@ class Chef class Knife KNIFE_ROOT = File.expand_path("../..", __dir__) - VERSION = "17.9.3".freeze + VERSION = "17.9.4".freeze end end diff --git a/knife/spec/unit/knife/bootstrap_spec.rb b/knife/spec/unit/knife/bootstrap_spec.rb index dc5e589c52..bb613f6646 100644 --- a/knife/spec/unit/knife/bootstrap_spec.rb +++ b/knife/spec/unit/knife/bootstrap_spec.rb @@ -817,7 +817,7 @@ describe Chef::Knife::Bootstrap do # Set everything to easily identifiable and obviously fake values # to verify that Chef::Config is being sourced instead of knife.config knife.config = {} - Chef::Config[:knife][:max_wait] = 9999 + Chef::Config[:knife][:max_wait] = 9999.0 Chef::Config[:knife][:winrm_user] = "winbob" Chef::Config[:knife][:winrm_port] = 9999 Chef::Config[:knife][:ca_trust_file] = "trust.me" @@ -836,7 +836,7 @@ describe Chef::Knife::Bootstrap do { logger: Chef::Log, # not configurable ca_trust_path: "trust.me", - max_wait_until_ready: 9999, + max_wait_until_ready: 9999, # converted to int operation_timeout: 9999, ssl_peer_fingerprint: "ABCDEF", winrm_transport: "kerberos", @@ -899,7 +899,7 @@ describe Chef::Knife::Bootstrap do # pull in the Chef::Config value Chef::Config[:knife][:winrm_auth_method] = "negotiate" knife.config[:connection_password] = "blue" - knife.config[:max_wait] = 1000 + knife.config[:max_wait] = 1000.0 knife.config[:connection_user] = "clippy" knife.config[:connection_port] = 1000 knife.config[:winrm_port] = 1001 # We should not see this value get used @@ -918,7 +918,7 @@ describe Chef::Knife::Bootstrap do { logger: Chef::Log, # not configurable ca_trust_path: "trust.the.internet", - max_wait_until_ready: 1000, + max_wait_until_ready: 1000, # converted to int operation_timeout: 1000, ssl_peer_fingerprint: "FEDCBA", winrm_transport: "kerberos", @@ -971,7 +971,7 @@ describe Chef::Knife::Bootstrap do # Set everything to easily identifiable and obviously fake values # to verify that Chef::Config is being sourced instead of knife.config knife.config = {} - Chef::Config[:knife][:max_wait] = 9999 + Chef::Config[:knife][:max_wait] = 9999.0 Chef::Config[:knife][:session_timeout] = 9999 Chef::Config[:knife][:ssh_user] = "sshbob" Chef::Config[:knife][:ssh_port] = 9999 @@ -986,7 +986,7 @@ describe Chef::Knife::Bootstrap do let(:expected_result) do { logger: Chef::Log, # not configurable - max_wait_until_ready: 9999.0, + max_wait_until_ready: 9999, # converted to int connection_timeout: 9999, user: "sshbob", bastion_host: "mygateway.local", @@ -1032,7 +1032,7 @@ describe Chef::Knife::Bootstrap do knife.config[:connection_port] = 12 knife.config[:ssh_port] = "13" # canary to indirectly verify we're not looking for the wrong CLI flag knife.config[:connection_password] = "feta cheese" - knife.config[:max_wait] = 150 + knife.config[:max_wait] = 150.0 knife.config[:session_timeout] = 120 knife.config[:use_sudo] = true knife.config[:use_sudo_pasword] = true @@ -1042,7 +1042,7 @@ describe Chef::Knife::Bootstrap do let(:expected_result) do { logger: Chef::Log, # not configurable - max_wait_until_ready: 150.0, # cli + max_wait_until_ready: 150, # cli (converted to int) connection_timeout: 120, # cli user: "sshalice", # cli password: "feta cheese", # cli @@ -1068,7 +1068,7 @@ describe Chef::Knife::Bootstrap do context "and all CLI options have been given" do before do knife.config = {} - knife.config[:max_wait] = 150 + knife.config[:max_wait] = 150.0 knife.config[:session_timeout] = 120 knife.config[:connection_user] = "sshroot" knife.config[:connection_port] = 1000 @@ -1093,7 +1093,7 @@ describe Chef::Knife::Bootstrap do let(:expected_result) do { logger: Chef::Log, # not configurable - max_wait_until_ready: 150, + max_wait_until_ready: 150, # converted to int connection_timeout: 120, user: "sshroot", password: "blah", diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 8cf2fb2182..3bf2d6f4ee 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -23,7 +23,7 @@ require_relative "version_string" class Chef CHEF_ROOT = File.expand_path("..", __dir__) - VERSION = Chef::VersionString.new("17.9.3") + VERSION = Chef::VersionString.new("17.9.4") end # |