openstack
/
puppet-glance
Code Issues Proposed changes

Merge "Do not validate database_connection format"

This commit is contained in:
Zuul 2020-08-31 15:37:03 +00:00 committed by Gerrit Code Review
parent ca95c196cc 4c943fb458
commit d96daf9256
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/api/db.pp
View File

@ -79,9 +79,6 @@ class glance::api::db (
$database_retry_interval_real = pick($::glance::api::database_retry_interval, $database_retry_interval) $database_retry_interval_real = pick($::glance::api::database_retry_interval, $database_retry_interval)
$database_max_overflow_real = pick($::glance::api::database_max_overflow, $database_max_overflow) $database_max_overflow_real = pick($::glance::api::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 { 'glance_api_config': oslo::db { 'glance_api_config':
db_max_retries => $database_db_max_retries, db_max_retries => $database_db_max_retries,
connection => $database_connection_real, connection => $database_connection_real,