Skip to content

Commit 1bededc

Browse files
committed
fix rhsmd.processtimeout support
1 parent 862d30c commit 1bededc

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

CHANGELOG

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
2020-4-28 5.5.0
2-
- Support rhsm.processTimeout in #97
2+
- Support rhsmd.processtimeout in #97
33
- Include masking of Entitlement type per MR in #99
44

55
2020-04-28 5.4.2

lib/puppet/type/rhsm_config.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ def self.text_options
7272
rhsm_plugindir: 'rhsm.plugindir',
7373
rhsmcertd_certcheckinterval: 'rhsmcertd.certcheckinterval',
7474
rhsmcertd_autoattachinterval: 'rhsmcertd.autoattachinterval',
75+
rhsmd_processtimeout: 'rhsmd.processtimeout',
7576
logging_default_log_level: 'logging.default_log_level',
7677
logging_subscription_manager: 'logging.subscription_manager',
7778
logging_rhsm: 'logging.rhsm',
@@ -199,10 +200,10 @@ def self.binary_options
199200
end
200201
end
201202

202-
newproperty(:rhsmd_processTimeout) do
203+
newproperty(:rhsmd_processtimeout) do
203204
desc 'Control how long to allow the rhsmd cron job to run'
204205
validate do |value|
205-
raise("Require a number. Was given #{value}.") unless value.to_i and value.to_i >= 0
206+
raise("Require a number. Was given #{value}.") unless value.to_i and value.to_i >= 0
206207
end
207208
end
208209

spec/spec_helper_local.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
require 'puppetlabs_spec_helper/module_spec_helper'
2222

2323
RSpec.configure do |config|
24-
# FIXME REVISIT - We may want to delegate to Facter like we do in
24+
# FIXME: We may want to delegate to Facter like we do in
2525
# Puppet::PuppetSpecInitializer.initialize_via_testhelper(config) because
2626
# this behavior is a duplication of the spec_helper in Facter.
2727
config.before :each do
@@ -31,7 +31,7 @@
3131
# Facter.collection.loader.load(:ipaddress)
3232
# Facter::Util::Loader.any_instance.stubs(:load_all) # removed in 3
3333
Facter.clear
34-
#Facter.clear_messages # removed in facter 3
34+
# Facter.clear_messages # removed in facter 3
3535
end
3636
# config.pattern += ',spec/facter/**/*_spec.rb'
3737
config.mock_with :rspec

spec/unit/type/rhsm_config_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
# rhsm_repo_ca_cert => '/etc/rhsm/ca/',
2929
# rhsm_report_package_profile => 1,
3030
# rhsmcertd_autoattachinterval => 1440,
31-
# rhsm_processTimeout => 3600,
31+
# rhsmd_processtimeout => 3600,
3232
# }
3333

3434
described_class = Puppet::Type.type(:rhsm_config)

0 commit comments

Comments
 (0)