openstack
/
puppet-barbican
Code Issues Proposed changes

db: remove useless pick 

Do not try to look for parameters in ::barbican that doesn't exist.

Change-Id: Ib3fc6b5673fb3c8d59717edd073071f88af331a9
This commit is contained in:
Emilien Macchi 2016-07-28 07:53:17 -04:00
parent 96d6a1d1ce
commit 31e84abe7f
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
manifests/db.pp
View File

@ -60,35 +60,27 @@ class barbican::db (
$database_db_max_retries = $::os_service_default,
) {
$database_connection_real = pick($::barbican::database_connection, $database_connection)
$database_idle_timeout_real = pick($::barbican::database_idle_timeout, $database_idle_timeout)
$database_min_pool_size_real = pick($::barbican::database_min_pool_size, $database_min_pool_size)
$database_max_pool_size_real = pick($::barbican::database_max_pool_size, $database_max_pool_size)
$database_max_retries_real = pick($::barbican::database_max_retries, $database_max_retries)
$database_retry_interval_real = pick($::barbican::database_retry_interval, $database_retry_interval)
$database_max_overflow_real = pick($::barbican::database_max_overflow, $database_max_overflow)
validate_re($database_connection_real,
validate_re($database_connection,
'^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?')
oslo::db { 'barbican_config':
connection => $database_connection_real,
idle_timeout => $database_idle_timeout_real,
min_pool_size => $database_min_pool_size_real,
max_pool_size => $database_max_pool_size_real,
max_retries => $database_max_retries_real,
retry_interval => $database_retry_interval_real,
max_overflow => $database_max_overflow_real,
connection => $database_connection,
idle_timeout => $database_idle_timeout,
min_pool_size => $database_min_pool_size,
max_pool_size => $database_max_pool_size,
max_retries => $database_max_retries,
retry_interval => $database_retry_interval,
max_overflow => $database_max_overflow,
db_max_retries => $database_db_max_retries,
}
# TODO(aschultz): Remove this config once barbican properly leverages oslo
$database_pool_size_real = pick($::barbican::database_pool_size, $database_pool_size)
barbican_config {
'DEFAULT/sql_connection': value => $database_connection_real, secret => true;
'DEFAULT/sql_idle_timeout': value => $database_idle_timeout_real;
'DEFAULT/sql_pool_size': value => $database_pool_size_real;
'DEFAULT/sql_pool_max_overflow': value => $database_max_overflow_real;
'DEFAULT/sql_connection': value => $database_connection, secret => true;
'DEFAULT/sql_idle_timeout': value => $database_idle_timeout;
'DEFAULT/sql_pool_size': value => $database_pool_size;
'DEFAULT/sql_pool_max_overflow': value => $database_max_overflow;
}
}