From 533743b3edee6680023f16db60e946d6646fd27f Mon Sep 17 00:00:00 2001 From: Chef Expeditor Date: Sat, 27 Oct 2018 03:36:44 +0000 Subject: Set several properties to desired_state: false These aren't part of the resource state. Signed-off-by: Tim Smith --- CHANGELOG.md | 7 ++++--- Gemfile.lock | 10 +++++----- VERSION | 2 +- chef-config/lib/chef-config/version.rb | 2 +- lib/chef/resource/apt_repository.rb | 6 ++++-- lib/chef/resource/build_essential.rb | 2 +- lib/chef/resource/chef_gem.rb | 3 ++- lib/chef/resource/cron_d.rb | 3 ++- lib/chef/version.rb | 2 +- 9 files changed, 21 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3665467469..0d2f08e9c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ - -## [v15.0.7](https://github.com/chef/chef/tree/v15.0.7) (2018-10-27) + +## [v15.0.8](https://github.com/chef/chef/tree/v15.0.8) (2018-10-27) #### Merged Pull Requests -- shell_out auto-timeout still needs to be restricted to only providers [#7793](https://github.com/chef/chef/pull/7793) ([lamont-granquist](https://github.com/lamont-granquist)) +- add GEMFILE_MOD to pin ohai to github master [#7796](https://github.com/chef/chef/pull/7796) ([lamont-granquist](https://github.com/lamont-granquist)) ### Changes since latest stable release #### Merged Pull Requests +- add GEMFILE_MOD to pin ohai to github master [#7796](https://github.com/chef/chef/pull/7796) ([lamont-granquist](https://github.com/lamont-granquist)) - shell_out auto-timeout still needs to be restricted to only providers [#7793](https://github.com/chef/chef/pull/7793) ([lamont-granquist](https://github.com/lamont-granquist)) - Remove cookbook merging/shadowing from the cookbooker loader [#7792](https://github.com/chef/chef/pull/7792) ([lamont-granquist](https://github.com/lamont-granquist)) - Remove legacy require_recipe DSL method [#7790](https://github.com/chef/chef/pull/7790) ([tas50](https://github.com/tas50)) diff --git a/Gemfile.lock b/Gemfile.lock index 27f801e2c9..3bb6385a5c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,10 +27,10 @@ GIT PATH remote: . specs: - chef (15.0.7) + chef (15.0.8) addressable bundler (>= 1.10) - chef-config (= 15.0.7) + chef-config (= 15.0.8) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -57,10 +57,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (15.0.7-universal-mingw32) + chef (15.0.8-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 15.0.7) + chef-config (= 15.0.8) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -103,7 +103,7 @@ PATH PATH remote: chef-config specs: - chef-config (15.0.7) + chef-config (15.0.8) addressable fuzzyurl mixlib-config (>= 2.2.12, < 3.0) diff --git a/VERSION b/VERSION index 38fb5545b0..3e26b8fe14 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.0.7 \ No newline at end of file +15.0.8 \ 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 ac3886a38b..35a4987251 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 = "15.0.7".freeze + VERSION = "15.0.8".freeze end # diff --git a/lib/chef/resource/apt_repository.rb b/lib/chef/resource/apt_repository.rb index 7ff337ec7c..a86ae2063d 100644 --- a/lib/chef/resource/apt_repository.rb +++ b/lib/chef/resource/apt_repository.rb @@ -62,14 +62,16 @@ class Chef property :keyserver, [String, nil, FalseClass], description: "The GPG keyserver where the key for the repo should be retrieved.", - default: "keyserver.ubuntu.com" + default: "keyserver.ubuntu.com", + desired_state: false property :key, [String, Array, nil, FalseClass], description: "If a keyserver is provided, this is assumed to be the fingerprint; otherwise it can be either the URI of GPG key for the repo, or a cookbook_file.", default: lazy { [] }, coerce: proc { |x| x ? Array(x) : x } property :key_proxy, [String, nil, FalseClass], - description: "If set, a specified proxy is passed to GPG via http-proxy=." + description: "If set, a specified proxy is passed to GPG via http-proxy=.", + desired_state: false property :cookbook, [String, nil, FalseClass], description: "If key should be a cookbook_file, specify a cookbook where the key is located for files/default. Default value is nil, so it will use the cookbook where the resource is used.", diff --git a/lib/chef/resource/build_essential.rb b/lib/chef/resource/build_essential.rb index 99722b14ed..d9d75fb83b 100644 --- a/lib/chef/resource/build_essential.rb +++ b/lib/chef/resource/build_essential.rb @@ -30,7 +30,7 @@ class Chef property :compile_time, [TrueClass, FalseClass], description: "Install the build essential packages at compile time.", - default: false + default: false, desired_state: false action :install do diff --git a/lib/chef/resource/chef_gem.rb b/lib/chef/resource/chef_gem.rb index 0a1b2ef736..86faa9203f 100644 --- a/lib/chef/resource/chef_gem.rb +++ b/lib/chef/resource/chef_gem.rb @@ -40,7 +40,8 @@ class Chef description: "The path of a gem binary to use for the installation. By default, the same version of Ruby that is used by the chef-client will be installed.", callbacks: { "The chef_gem resource is restricted to the current gem environment, use gem_package to install to other environments." => proc { |v| v == "#{RbConfig::CONFIG['bindir']}/gem" }, - } + }, desired_state: false + property :compile_time, [TrueClass, FalseClass], description: "Controls the phase during which a gem is installed on a node. Set to 'true' to install a gem while the resource collection is being built (the 'compile phase'). Set to 'false' to install a gem while the chef-client is configuring the node (the 'converge phase').", default: false, desired_state: false diff --git a/lib/chef/resource/cron_d.rb b/lib/chef/resource/cron_d.rb index 304a1ad388..1ad2955f53 100644 --- a/lib/chef/resource/cron_d.rb +++ b/lib/chef/resource/cron_d.rb @@ -90,7 +90,8 @@ class Chef description: "Set the name of the cron job. If this isn't specified we'll use the resource name.", name_property: true - property :cookbook, String + property :cookbook, String, + desired_state: false property :predefined_value, String, description: 'Schedule your cron job with one of the special predefined value instead of ** * pattern. This correspond to "@reboot", "@yearly", "@annually", "@monthly", "@weekly", "@daily", "@midnight" or "@hourly".', diff --git a/lib/chef/version.rb b/lib/chef/version.rb index e85c65c741..b1fbcaefb6 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("15.0.7") + VERSION = Chef::VersionString.new("15.0.8") end # -- cgit v1.2.1