Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Permit setting default_schedules to true #852

Merged
merged 1 commit into from
Jan 12, 2023
Merged

Permit setting default_schedules to true #852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions manifests/agent/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
class puppet::agent::config inherits puppet::config {
puppet::config::agent{
'classfile': value => $puppet::classfile;
'localconfig': value => '$vardir/localconfig';
'default_schedules': value => false;
'localconfig': value => $puppet::localconfig;
'default_schedules': value => $puppet::agent_default_schedules;
'report': value => $puppet::report;
'masterport': value => $puppet::port;
'environment': value => $puppet::environment;
Expand Down
6 changes: 6 additions & 0 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@
#
# $hiera_config:: The hiera configuration file.
#
# $localconfig:: The localconfig setting.
#
# $syslogfacility:: Facility name to use when logging to syslog
#
# $use_srv_records:: Whether DNS SRV records will be used to resolve
Expand Down Expand Up @@ -175,6 +177,8 @@
#
# $environment:: Default environment of the Puppet agent
#
# $agent_default_schedules:: A boolean to enable/disable the default schedules
#
# $agent_additional_settings:: A hash of additional agent settings.
# Example: {stringify_facts => true}
#
Expand Down Expand Up @@ -600,6 +604,7 @@
Optional[String] $systemd_cmd = $puppet::params::systemd_cmd,
Integer[0] $systemd_randomizeddelaysec = $puppet::params::systemd_randomizeddelaysec,
Boolean $agent_noop = $puppet::params::agent_noop,
Boolean $agent_default_schedules = $puppet::params::agent_default_schedules,
Boolean $show_diff = $puppet::params::show_diff,
Optional[Stdlib::HTTPUrl] $module_repository = $puppet::params::module_repository,
Optional[Integer[0]] $http_connect_timeout = $puppet::params::http_connect_timeout,
Expand All @@ -619,6 +624,7 @@
Optional[String] $agent_restart_command = $puppet::params::agent_restart_command,
String $classfile = $puppet::params::classfile,
String $hiera_config = $puppet::params::hiera_config,
String $localconfig = $puppet::params::localconfig,
String $auth_template = $puppet::params::auth_template,
Boolean $allow_any_crl_auth = $puppet::params::allow_any_crl_auth,
Array[String] $auth_allowed = $puppet::params::auth_allowed,
Expand Down
2 changes: 2 additions & 0 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
$show_diff = false
$module_repository = undef
$hiera_config = '$confdir/hiera.yaml'
$localconfig = '$vardir/localconfig'
$usecacheonfailure = true
$ca_server = undef
$ca_port = undef
Expand All @@ -33,6 +34,7 @@
$server_compile_mode = undef
$dns_alt_names = []
$use_srv_records = false
$agent_default_schedules = false

if defined('$::domain') {
$srv_domain = $facts['networking']['domain']
Expand Down