Skip to content

Commit 2822547

Browse files
committed
Remove stringify facts and configtimeout.
This settings are both deprecated in 4 or set to true. Eg; stringify facts
1 parent 00a5f28 commit 2822547

File tree

1 file changed

+17
-6
lines changed

1 file changed

+17
-6
lines changed

manifests/agent.pp

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -407,14 +407,25 @@
407407
section => 'main',
408408
}
409409
}
410-
ini_setting {'puppetagentconfigtimeout':
411-
setting => 'configtimeout',
412-
value => $configtimeout,
413-
}
414-
if $stringify_facts != undef {
410+
if versioncmp($::puppetversion, "4.0.0") < 0 {
411+
ini_setting {'puppetagentconfigtimeout':
412+
setting => 'configtimeout',
413+
value => $configtimeout,
414+
}
415+
if $stringify_facts != undef {
416+
ini_setting {'puppetagentstringifyfacts':
417+
setting => 'stringify_facts',
418+
value => $stringify_facts,
419+
}
420+
}
421+
} else {
422+
ini_setting {'puppetagentconfigtimeout':
423+
setting => 'configtimeout',
424+
ensure => absent,
425+
}
415426
ini_setting {'puppetagentstringifyfacts':
416427
setting => 'stringify_facts',
417-
value => $stringify_facts,
428+
ensure => absent,
418429
}
419430
}
420431
if $verbose != undef {

0 commit comments

Comments
 (0)