Merge pull request #184 from ajroetker/maint/allow_database_validation_to_be_false

(maint) Allow database_validation to be false
This commit is contained in:
Ken Barber 2015-06-02 14:46:09 +01:00
commit 9dd94b0b8c

View file

@ -127,6 +127,12 @@ class puppetdb (
}
if ($database == 'postgres') {
$database_before = str2bool($database_validate) ? {
false => Class['::puppetdb::server'],
default => [Class['::puppetdb::server'], Class['::puppetdb::server::validate_db']],
}
class { '::puppetdb::database::postgresql':
listen_addresses => $database_listen_address,
database_name => $database_name,
@ -135,7 +141,7 @@ class puppetdb (
manage_server => $manage_dbserver,
manage_package_repo => $manage_package_repo,
postgres_version => $postgres_version,
before => [Class['::puppetdb::server'], Class['::puppetdb::server::validate_db']],
before => $database_before
}
}
}