Skip to content

Commit 24e4f3a

Browse files
committed
Make pluginsource, pluginfactsource and classfile optional
These parameters have a sane default and doesn't need to be in the config.
1 parent c555354 commit 24e4f3a

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

manifests/agent/config.pp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# @api private
33
class puppet::agent::config inherits puppet::config {
44
puppet::config::agent{
5-
'classfile': value => $puppet::classfile;
65
'localconfig': value => '$vardir/localconfig';
76
'default_schedules': value => false;
87
'report': value => $puppet::report;
@@ -14,6 +13,11 @@
1413
'noop': value => $puppet::agent_noop;
1514
'usecacheonfailure': value => $puppet::usecacheonfailure;
1615
}
16+
if $puppet::classfile {
17+
puppet::config::agent {
18+
'classfile': value => $puppet::classfile;
19+
}
20+
}
1721
if $puppet::http_connect_timeout != undef {
1822
puppet::config::agent {
1923
'http_connect_timeout': value => $puppet::http_connect_timeout;

manifests/init.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -603,12 +603,12 @@
603603
Array[String] $dns_alt_names = $puppet::params::dns_alt_names,
604604
Boolean $use_srv_records = $puppet::params::use_srv_records,
605605
Optional[String] $srv_domain = $puppet::params::srv_domain,
606-
String $pluginsource = $puppet::params::pluginsource,
607-
String $pluginfactsource = $puppet::params::pluginfactsource,
606+
Optional[String] $pluginsource = $puppet::params::pluginsource,
607+
Optional[String] $pluginfactsource = $puppet::params::pluginfactsource,
608608
Hash[String, Data] $additional_settings = $puppet::params::additional_settings,
609609
Hash[String, Data] $agent_additional_settings = $puppet::params::agent_additional_settings,
610610
Optional[String] $agent_restart_command = $puppet::params::agent_restart_command,
611-
String $classfile = $puppet::params::classfile,
611+
Optional[String] $classfile = $puppet::params::classfile,
612612
String $hiera_config = $puppet::params::hiera_config,
613613
String $auth_template = $puppet::params::auth_template,
614614
Boolean $allow_any_crl_auth = $puppet::params::allow_any_crl_auth,

manifests/params.pp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,9 @@
3535
$use_srv_records = false
3636
$srv_domain = fact('networking.domain')
3737

38-
# lint:ignore:puppet_url_without_modules
39-
$pluginsource = 'puppet:///plugins'
40-
$pluginfactsource = 'puppet:///pluginfacts'
41-
# lint:endignore
42-
$classfile = '$statedir/classes.txt'
38+
$pluginsource = undef
39+
$pluginfactsource = undef
40+
$classfile = undef
4341
$syslogfacility = undef
4442
$environment = $::environment
4543

0 commit comments

Comments
 (0)