From 8538c85867993a3e49e4deacbbdbec610424a655 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Fri, 27 Apr 2018 15:53:10 -0700 Subject: Set desired_state: false on several properties These are not state attributes, but we're treating them like state attributes. Signed-off-by: Tim Smith --- lib/chef/resource/launchd.rb | 4 ++-- lib/chef/resource/ohai_hint.rb | 2 +- lib/chef/resource/openssl_rsa_private_key.rb | 2 +- lib/chef/resource/rhsm_register.rb | 2 +- lib/chef/resource/scm.rb | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/chef/resource/launchd.rb b/lib/chef/resource/launchd.rb index 1addffe404..9161efa6ea 100644 --- a/lib/chef/resource/launchd.rb +++ b/lib/chef/resource/launchd.rb @@ -31,8 +31,8 @@ class Chef allowed_actions :create, :create_if_missing, :delete, :enable, :disable, :restart property :label, String, identity: true, name_property: true - property :backup, [Integer, FalseClass] - property :cookbook, String + property :backup, [Integer, FalseClass], desired_state: false + property :cookbook, String, desired_state: false property :group, [String, Integer] property :plist_hash, Hash property :mode, [String, Integer] diff --git a/lib/chef/resource/ohai_hint.rb b/lib/chef/resource/ohai_hint.rb index 3b9f49385d..6eb36aea13 100644 --- a/lib/chef/resource/ohai_hint.rb +++ b/lib/chef/resource/ohai_hint.rb @@ -33,7 +33,7 @@ class Chef property :compile_time, [TrueClass, FalseClass], description: "Should the resource execute during the compile time phase", - default: true + default: true, desired_state: false action :create do description "Create an Ohai hint file" diff --git a/lib/chef/resource/openssl_rsa_private_key.rb b/lib/chef/resource/openssl_rsa_private_key.rb index 968eeded4c..be4c85bcbb 100644 --- a/lib/chef/resource/openssl_rsa_private_key.rb +++ b/lib/chef/resource/openssl_rsa_private_key.rb @@ -65,7 +65,7 @@ class Chef property :force, [TrueClass, FalseClass], description: "Force creating the key even if the existing key exists.", - default: false + default: false, desired_state: false action :create do return if new_resource.force || priv_key_file_valid?(new_resource.path, new_resource.key_pass) diff --git a/lib/chef/resource/rhsm_register.rb b/lib/chef/resource/rhsm_register.rb index 05e748e98d..3bb504a8ab 100644 --- a/lib/chef/resource/rhsm_register.rb +++ b/lib/chef/resource/rhsm_register.rb @@ -58,7 +58,7 @@ class Chef property :force, [TrueClass, FalseClass], description: "If true, the system will be registered even if it is already registered. Normally, any register operations will fail if the machine is has already registered.", - default: false + default: false, desired_state: false action :register do description "Register the node with RHSM" diff --git a/lib/chef/resource/scm.rb b/lib/chef/resource/scm.rb index 2fef1a1466..d8b4dd304a 100644 --- a/lib/chef/resource/scm.rb +++ b/lib/chef/resource/scm.rb @@ -36,8 +36,8 @@ class Chef property :enable_submodules, [TrueClass, FalseClass], default: false property :enable_checkout, [TrueClass, FalseClass], default: true property :remote, String, default: "origin" - property :ssh_wrapper, String - property :timeout, Integer + property :ssh_wrapper, String, desired_state: false + property :timeout, Integer, desired_state: false property :checkout_branch, String, default: "deploy" property :environment, [Hash, nil], default: nil -- cgit v1.2.1