From 5317e909dc63935c0cbeb3414b273fd8e366badb Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 31 Aug 2020 17:51:23 +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: If2764453402c460e9a96b91400bd6974c48fcf02 --- manifests/db.pp | 3 --- 1 file changed, 3 deletions(-) diff --git a/manifests/db.pp b/manifests/db.pp index dad1db58..d478d64b 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -78,9 +78,6 @@ class manila::db ( $database_retry_interval_real = pick($::manila::database_retry_interval, $database_retry_interval) $database_max_overflow_real = pick($::manila::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 { 'manila_config': connection => $database_connection_real, connection_recycle_time => $database_connection_recycle_time_real,