openstack/puppet-trove
Code Issues Proposed changes

Do not validate database_connection format

Browse Source 
Currently we validate database_connection in 2 layers, each puppet
modules and puppet-oslo, however this makes it difficult to maintain
validation pattern because we always need to fix both.
This patch removes the validation from each puppet modules so that
we need to maitain only one place, puppet-oslo to update validation
logic.

Change-Id: I6de003300a7efdfca4b38c4b61859891fcc8780b
This commit is contained in:
Takashi Kajinami 2020-08-31 17:57:44 +09:00
parent f6a0c6413d
commit 47d8b0f264
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/db.pp
View File

@ -72,9 +72,6 @@ class trove::db (
$database_retry_interval_real = pick($::trove::database_retry_interval, $database_retry_interval) $database_retry_interval_real = pick($::trove::database_retry_interval, $database_retry_interval)
$database_max_overflow_real = pick($::trove::database_max_overflow, $database_max_overflow) $database_max_overflow_real = pick($::trove::database_max_overflow, $database_max_overflow)
validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection_real,
['^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?'])
oslo::db { 'trove_config': oslo::db { 'trove_config':
connection => $database_connection_real, connection => $database_connection_real,
connection_recycle_time => $database_connection_recycle_time_real, connection_recycle_time => $database_connection_recycle_time_real,