summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-04-27 15:45:33 -0700
committerGitHub <noreply@github.com>2018-04-27 15:45:33 -0700
commit2651a43b251f209a63ebc814330271ec5f1735b2 (patch)
treeda1ae5b8ab42643aed9562a39093b4e34f3b8547
parentaf5eb57c5445b66279b7ec0fd84a2be6ef9b6dfd (diff)
parenta787f3e812dccc964411df0da1b3df6a5ee0d5ad (diff)
downloadchef-2651a43b251f209a63ebc814330271ec5f1735b2.tar.gz
Merge pull request #7193 from chef/rhsm_fix
rhsm_register: skip the registration check if force is specified
-rw-r--r--lib/chef/resource/rhsm_register.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/resource/rhsm_register.rb b/lib/chef/resource/rhsm_register.rb
index 05e748e98d..4bf9b7f1c4 100644
--- a/lib/chef/resource/rhsm_register.rb
+++ b/lib/chef/resource/rhsm_register.rb
@@ -88,7 +88,7 @@ class Chef
sensitive new_resource.sensitive
command register_command
action :run
- not_if { registered_with_rhsm? }
+ not_if { registered_with_rhsm? } unless new_resource.force
end
yum_package "katello-agent" do