diff options
| -rw-r--r-- | .expeditor/config.yml | 3 | ||||
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | Gemfile.lock | 10 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
| -rw-r--r-- | lib/chef/knife/bootstrap.rb | 12 | ||||
| -rw-r--r-- | lib/chef/provider/service/windows.rb | 2 | ||||
| -rw-r--r-- | lib/chef/version.rb | 2 |
8 files changed, 26 insertions, 15 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 1e0a15b574..0e16585469 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -43,7 +43,7 @@ github: - chef-13: version_constraint: 13* -# These actions are taken, in order they are specified, anytime a Pull Request is merged. +# These actions are taken, in order they are specified, anytime a PR is merged. merge_actions: - built_in:bump_version: ignore_labels: @@ -75,4 +75,3 @@ subscriptions: - built_in:tag_docker_image - built_in:publish_rubygems - built_in:notify_chefio_slack_channels - diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e0e2443d9..a04efd1be9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,17 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 13.10.6 --> -## [v13.10.6](https://github.com/chef/chef/tree/v13.10.6) (2018-08-14) +<!-- latest_release 13.11.0 --> +## [v13.11.0](https://github.com/chef/chef/tree/v13.11.0) (2018-09-25) #### Merged Pull Requests -- Use the existing helper method for package resource classes that don't support allow_downgrade [#7548](https://github.com/chef/chef/pull/7548) ([tas50](https://github.com/tas50)) +- Improve the error message when knife bootstrap windows isn't installed [#7686](https://github.com/chef/chef/pull/7686) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=13.10.4 --> ### Changes since 13.10.4 release #### Merged Pull Requests +- Improve the error message when knife bootstrap windows isn't installed [#7686](https://github.com/chef/chef/pull/7686) ([tas50](https://github.com/tas50)) <!-- 13.11.0 --> +- windows_service: Remove potentially sensitive info from the log [#7688](https://github.com/chef/chef/pull/7688) ([tas50](https://github.com/tas50)) <!-- 13.10.7 --> - Use the existing helper method for package resource classes that don't support allow_downgrade [#7548](https://github.com/chef/chef/pull/7548) ([tas50](https://github.com/tas50)) <!-- 13.10.6 --> - Update to openssl 1.0.2p [#7547](https://github.com/chef/chef/pull/7547) ([tas50](https://github.com/tas50)) <!-- 13.10.5 --> <!-- release_rollup --> diff --git a/Gemfile.lock b/Gemfile.lock index 2b4fd7be69..377dce638a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,10 +9,10 @@ GIT PATH remote: . specs: - chef (13.10.6) + chef (13.11.0) addressable bundler (>= 1.10) - chef-config (= 13.10.6) + chef-config (= 13.11.0) chef-zero (~> 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -39,10 +39,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (13.10.6-universal-mingw32) + chef (13.11.0-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 13.10.6) + chef-config (= 13.11.0) chef-zero (~> 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -84,7 +84,7 @@ PATH PATH remote: chef-config specs: - chef-config (13.10.6) + chef-config (13.11.0) addressable fuzzyurl mixlib-config (>= 2.2.12, < 3.0) @@ -1 +1 @@ -13.10.6
\ No newline at end of file +13.11.0
\ No newline at end of file diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 44fb43b516..c8853a52f9 100644 --- a/chef-config/lib/chef-config/version.rb +++ b/chef-config/lib/chef-config/version.rb @@ -21,7 +21,7 @@ module ChefConfig CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__) - VERSION = "13.10.6" + VERSION = "13.11.0" end # diff --git a/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb index 9decacce13..ae01a73c37 100644 --- a/lib/chef/knife/bootstrap.rb +++ b/lib/chef/knife/bootstrap.rb @@ -420,10 +420,11 @@ class Chef exit 1 elsif server_name == "windows" # catches "knife bootstrap windows" when that command is not installed - ui.warn("Hostname containing 'windows' specified. Please install 'knife-windows' if you are attempting to bootstrap a Windows node via WinRM.") + ui.warn("'knife bootstrap windows' specified, but the knife-windows plugin is not installed. Please install 'knife-windows' if you are attempting to bootstrap a Windows node via WinRM.") end end + # make sure policyfile values are set correctly def validate_options! if incomplete_policyfile_options? ui.error("--policy-name and --policy-group must be specified together") @@ -435,6 +436,9 @@ class Chef true end + # setup a Chef::Knife::Ssh object using the passed config options + # + # @return Chef::Knife::Ssh def knife_ssh ssh = Chef::Knife::Ssh.new ssh.ui = ui @@ -452,6 +456,10 @@ class Chef ssh end + # prompt for a password then return a knife ssh object with that password set + # and with ssh_identity_file set to nil + # + # @return Chef::Knife::Ssh def knife_ssh_with_password_auth ssh = knife_ssh ssh.config[:ssh_identity_file] = nil @@ -459,6 +467,8 @@ class Chef ssh end + # build the ssh dommand for bootrapping + # @return String def ssh_command command = render_template diff --git a/lib/chef/provider/service/windows.rb b/lib/chef/provider/service/windows.rb index 931e320695..71427a410d 100644 --- a/lib/chef/provider/service/windows.rb +++ b/lib/chef/provider/service/windows.rb @@ -74,7 +74,7 @@ class Chef::Provider::Service::Windows < Chef::Provider::Service }.reject { |k, v| v.nil? || v.length == 0 } Win32::Service.configure(new_config) - Chef::Log.info "#{@new_resource} configured with #{new_config.inspect}" + Chef::Log.info "#{@new_resource} configured." if new_config.has_key?(:service_start_name) unless Chef::ReservedNames::Win32::Security.get_account_right(canonicalize_username(new_config[:service_start_name])).include?(SERVICE_RIGHT) diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 0077a17287..9e56184e30 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -23,7 +23,7 @@ require "chef/version_string" class Chef CHEF_ROOT = File.expand_path("../..", __FILE__) - VERSION = Chef::VersionString.new("13.10.6") + VERSION = Chef::VersionString.new("13.11.0") end # |