openstack
/
puppet-ironic
Code Issues Proposed changes

Do not validate database_connection format 

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: Ib8de24dc18c7eb95bf53313e47e122e5d81e2da0
This commit is contained in:
Takashi Kajinami 2020-08-31 17:49:21 +09:00
parent 841f27fc03
commit 0d6bbc44a0
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/db.pp
View File

@ -79,9 +79,6 @@ class ironic::db (
$database_max_pool_size_real = pick($::ironic::database_max_pool_size, $database_max_pool_size)
$database_max_overflow_real = pick($::ironic::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 { 'ironic_config':
connection => $database_connection_real,
connection_recycle_time => $database_connection_recycle_time_real,

3
manifests/inspector/db.pp
View File

@ -71,9 +71,6 @@ class ironic::inspector::db (
$database_connection_real = pick($::ironic::inspector::db_connection, $database_connection)
validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection_real,
['^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?'])
oslo::db { 'ironic_inspector_config':
connection => $database_connection_real,
connection_recycle_time => $database_connection_recycle_time,