From 46756a830471fdc9560e045d9a66a18493540703 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 31 Aug 2020 00:00:27 +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: I84312d013089696c54f8ec7e64dabdab95b07f2a --- manifests/db.pp | 3 --- 1 file changed, 3 deletions(-) diff --git a/manifests/db.pp b/manifests/db.pp index ea512661..b3345505 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -72,9 +72,6 @@ class cinder::db ( $database_retry_interval_real = pick($::cinder::database_retry_interval,$database_retry_interval) $database_max_overflow_real = pick($::cinder::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 { 'cinder_config': db_max_retries => $database_db_max_retries, connection => $database_connection_real,