Merge remote-tracking branch 'upstream1/master' into kpaulisse-dbconnections
This commit is contained in:
Kevin Paulisse
commit
4f03c6cf6b
6 changed files with 74 additions and 41 deletions
|
|
@ -70,6 +70,8 @@ class puppetdb (
|
|||
$temp_usage = $puppetdb::params::temp_usage,
|
||||
$certificate_whitelist_file = $puppetdb::params::certificate_whitelist_file,
|
||||
$certificate_whitelist = $puppetdb::params::certificate_whitelist,
|
||||
$database_max_pool_size = $puppetdb::params::database_max_pool_size,
|
||||
$read_database_max_pool_size = $puppetdb::params::read_database_max_pool_size,
|
||||
) inherits puppetdb::params {
|
||||
|
||||
class { '::puppetdb::server':
|
||||
|
|
@ -138,6 +140,8 @@ class puppetdb (
|
|||
temp_usage => $temp_usage,
|
||||
certificate_whitelist_file => $certificate_whitelist_file,
|
||||
certificate_whitelist => $certificate_whitelist,
|
||||
database_max_pool_size => $database_max_pool_size,
|
||||
read_database_max_pool_size => $read_database_max_pool_size,
|
||||
}
|
||||
|
||||
if ($database == 'postgres') {
|
||||
|
|
|
|||
|
|
@ -20,14 +20,15 @@ class puppetdb::params inherits puppetdb::globals {
|
|||
$postgres_version = '9.4'
|
||||
|
||||
# The remaining database settings are not used for an embedded database
|
||||
$database_host = 'localhost'
|
||||
$database_port = '5432'
|
||||
$database_name = 'puppetdb'
|
||||
$database_username = 'puppetdb'
|
||||
$database_password = 'puppetdb'
|
||||
$database_ssl = undef
|
||||
$jdbc_ssl_properties = ''
|
||||
$database_validate = true
|
||||
$database_host = 'localhost'
|
||||
$database_port = '5432'
|
||||
$database_name = 'puppetdb'
|
||||
$database_username = 'puppetdb'
|
||||
$database_password = 'puppetdb'
|
||||
$database_ssl = undef
|
||||
$jdbc_ssl_properties = ''
|
||||
$database_validate = true
|
||||
$database_max_pool_size = '25'
|
||||
|
||||
# These settings manage the various auto-deactivation and auto-purge settings
|
||||
$node_ttl = '0s'
|
||||
|
|
@ -57,6 +58,7 @@ class puppetdb::params inherits puppetdb::globals {
|
|||
$read_conn_max_age = '60'
|
||||
$read_conn_keep_alive = '45'
|
||||
$read_conn_lifetime = '0'
|
||||
$read_database_max_pool_size = '25'
|
||||
|
||||
$manage_firewall = true
|
||||
$java_args = {}
|
||||
|
|
|
|||
|
|
@ -65,6 +65,8 @@ class puppetdb::server (
|
|||
$temp_usage = $puppetdb::params::temp_usage,
|
||||
$certificate_whitelist_file = $puppetdb::params::certificate_whitelist_file,
|
||||
$certificate_whitelist = $puppetdb::params::certificate_whitelist,
|
||||
$database_max_pool_size = $puppetdb::params::database_max_pool_size,
|
||||
$read_database_max_pool_size = $puppetdb::params::read_database_max_pool_size,
|
||||
) inherits puppetdb::params {
|
||||
# deprecation warnings
|
||||
if $database_ssl != undef {
|
||||
|
|
@ -160,6 +162,7 @@ class puppetdb::server (
|
|||
database_password => $database_password,
|
||||
database_name => $database_name,
|
||||
database_ssl => $database_ssl,
|
||||
database_max_pool_size => $database_max_pool_size,
|
||||
jdbc_ssl_properties => $jdbc_ssl_properties,
|
||||
database_validate => $database_validate,
|
||||
database_embedded_path => $database_embedded_path,
|
||||
|
|
@ -178,23 +181,24 @@ class puppetdb::server (
|
|||
}
|
||||
|
||||
class { 'puppetdb::server::read_database':
|
||||
database => $read_database,
|
||||
database_host => $read_database_host,
|
||||
database_port => $read_database_port,
|
||||
database_username => $read_database_username,
|
||||
database_password => $read_database_password,
|
||||
database_name => $read_database_name,
|
||||
database_ssl => $read_database_ssl,
|
||||
jdbc_ssl_properties => $read_database_jdbc_ssl_properties,
|
||||
database_validate => $read_database_validate,
|
||||
log_slow_statements => $read_log_slow_statements,
|
||||
conn_max_age => $read_conn_max_age,
|
||||
conn_keep_alive => $read_conn_keep_alive,
|
||||
conn_lifetime => $read_conn_lifetime,
|
||||
confdir => $confdir,
|
||||
puppetdb_user => $puppetdb_user,
|
||||
puppetdb_group => $puppetdb_group,
|
||||
notify => Service[$puppetdb_service],
|
||||
database => $read_database,
|
||||
database_host => $read_database_host,
|
||||
database_port => $read_database_port,
|
||||
database_username => $read_database_username,
|
||||
database_password => $read_database_password,
|
||||
database_name => $read_database_name,
|
||||
database_ssl => $read_database_ssl,
|
||||
jdbc_ssl_properties => $read_database_jdbc_ssl_properties,
|
||||
database_validate => $read_database_validate,
|
||||
log_slow_statements => $read_log_slow_statements,
|
||||
conn_max_age => $read_conn_max_age,
|
||||
conn_keep_alive => $read_conn_keep_alive,
|
||||
conn_lifetime => $read_conn_lifetime,
|
||||
confdir => $confdir,
|
||||
puppetdb_user => $puppetdb_user,
|
||||
puppetdb_group => $puppetdb_group,
|
||||
notify => Service[$puppetdb_service],
|
||||
database_max_pool_size => $read_database_max_pool_size,
|
||||
}
|
||||
|
||||
if str2bool($ssl_set_cert_paths) == true
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ class puppetdb::server::database (
|
|||
$confdir = $puppetdb::params::confdir,
|
||||
$puppetdb_user = $puppetdb::params::puppetdb_user,
|
||||
$puppetdb_group = $puppetdb::params::puppetdb_group,
|
||||
$database_max_pool_size = $puppetdb::params::database_max_pool_size,
|
||||
) inherits puppetdb::params {
|
||||
|
||||
if str2bool($database_validate) {
|
||||
|
|
@ -159,4 +160,9 @@ class puppetdb::server::database (
|
|||
setting => 'conn-lifetime',
|
||||
value => $conn_lifetime,
|
||||
}
|
||||
|
||||
ini_setting { 'puppetdb_database_max_pool_size':
|
||||
setting => 'maximum-pool-size',
|
||||
value => $database_max_pool_size,
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,21 +1,22 @@
|
|||
# PRIVATE CLASS - do not use directly
|
||||
class puppetdb::server::read_database (
|
||||
$database = $puppetdb::params::read_database,
|
||||
$database_host = $puppetdb::params::read_database_host,
|
||||
$database_port = $puppetdb::params::read_database_port,
|
||||
$database_username = $puppetdb::params::read_database_username,
|
||||
$database_password = $puppetdb::params::read_database_password,
|
||||
$database_name = $puppetdb::params::read_database_name,
|
||||
$database_ssl = $puppetdb::params::read_database_ssl,
|
||||
$jdbc_ssl_properties = $puppetdb::params::read_database_jdbc_ssl_properties,
|
||||
$database_validate = $puppetdb::params::read_database_validate,
|
||||
$log_slow_statements = $puppetdb::params::read_log_slow_statements,
|
||||
$conn_max_age = $puppetdb::params::read_conn_max_age,
|
||||
$conn_keep_alive = $puppetdb::params::read_conn_keep_alive,
|
||||
$conn_lifetime = $puppetdb::params::read_conn_lifetime,
|
||||
$confdir = $puppetdb::params::confdir,
|
||||
$puppetdb_user = $puppetdb::params::puppetdb_user,
|
||||
$puppetdb_group = $puppetdb::params::puppetdb_group,
|
||||
$database = $puppetdb::params::read_database,
|
||||
$database_host = $puppetdb::params::read_database_host,
|
||||
$database_port = $puppetdb::params::read_database_port,
|
||||
$database_username = $puppetdb::params::read_database_username,
|
||||
$database_password = $puppetdb::params::read_database_password,
|
||||
$database_name = $puppetdb::params::read_database_name,
|
||||
$database_ssl = $puppetdb::params::read_database_ssl,
|
||||
$jdbc_ssl_properties = $puppetdb::params::read_database_jdbc_ssl_properties,
|
||||
$database_validate = $puppetdb::params::read_database_validate,
|
||||
$log_slow_statements = $puppetdb::params::read_log_slow_statements,
|
||||
$conn_max_age = $puppetdb::params::read_conn_max_age,
|
||||
$conn_keep_alive = $puppetdb::params::read_conn_keep_alive,
|
||||
$conn_lifetime = $puppetdb::params::read_conn_lifetime,
|
||||
$confdir = $puppetdb::params::confdir,
|
||||
$puppetdb_user = $puppetdb::params::puppetdb_user,
|
||||
$puppetdb_group = $puppetdb::params::puppetdb_group,
|
||||
$database_max_pool_size = $puppetdb::params::read_database_max_pool_size,
|
||||
) inherits puppetdb::params {
|
||||
|
||||
# Only add the read database configuration if database host is defined.
|
||||
|
|
|
|||
|
|
@ -125,6 +125,14 @@ describe 'puppetdb::server::database', :type => :class do
|
|||
'setting' => 'conn-lifetime',
|
||||
'value' => '0'
|
||||
)}
|
||||
it { should contain_ini_setting('puppetdb_database_max_pool_size').
|
||||
with(
|
||||
'ensure' => 'present',
|
||||
'path' => '/etc/puppetlabs/puppetdb/conf.d/database.ini',
|
||||
'section' => 'database',
|
||||
'setting' => 'maximum-pool-size',
|
||||
'value' => '25'
|
||||
)}
|
||||
end
|
||||
|
||||
describe 'when using a legacy PuppetDB version' do
|
||||
|
|
@ -233,6 +241,14 @@ describe 'puppetdb::server::database', :type => :class do
|
|||
'setting' => 'conn-lifetime',
|
||||
'value' => '0'
|
||||
)}
|
||||
it { should contain_ini_setting('puppetdb_database_max_pool_size').
|
||||
with(
|
||||
'ensure' => 'present',
|
||||
'path' => '/etc/puppetdb/conf.d/database.ini',
|
||||
'section' => 'database',
|
||||
'setting' => 'maximum-pool-size',
|
||||
'value' => '25'
|
||||
)}
|
||||
end
|
||||
|
||||
describe 'when overriding database_path for embedded' do
|
||||
|
|
|
|||
Loading…
Reference in a new issue