From 47d8b0f264d99391ee63c6718398c5f30e0d4063 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 31 Aug 2020 17:57:44 +0900 Subject: [PATCH] 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: I6de003300a7efdfca4b38c4b61859891fcc8780b --- manifests/db.pp | 3 --- 1 file changed, 3 deletions(-) diff --git a/manifests/db.pp b/manifests/db.pp index eaa70dc7..8af9087c 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -72,9 +72,6 @@ class trove::db ( $database_retry_interval_real = pick($::trove::database_retry_interval, $database_retry_interval) $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': connection => $database_connection_real, connection_recycle_time => $database_connection_recycle_time_real,