Skip to content

Commit 77ed676

Browse files
committed
Don't add require for validate class if we're not validating
1 parent 4aeedf2 commit 77ed676

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

manifests/server/database_ini.pp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,16 @@
3838
}
3939
}
4040

41+
$ini_setting_require = str2bool($database_validate) ? {
42+
false => undef,
43+
default => Class['puppetdb::server::validate_db'],
44+
}
4145
# Set the defaults
4246
Ini_setting {
4347
path => "${confdir}/database.ini",
4448
ensure => present,
4549
section => 'database',
46-
require => Class['puppetdb::server::validate_db'],
50+
require => $ini_setting_require
4751
}
4852

4953
if $database == 'embedded' {

manifests/server/read_database_ini.pp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,16 @@
4545
mode => '0600';
4646
}
4747

48+
$ini_setting_require = str2bool($database_validate) ? {
49+
false => undef,
50+
default => Class['puppetdb::server::validate_read_db'],
51+
}
4852
# Set the defaults
4953
Ini_setting {
5054
path => "${confdir}/read_database.ini",
5155
ensure => present,
5256
section => 'read-database',
53-
require => Class['puppetdb::server::validate_db'],
57+
require => $ini_setting_require,
5458
}
5559

5660
if $database == 'postgres' {

0 commit comments

Comments
 (0)