From f9bcdf4fcbc1b91bd99bac4efef96aefb2b19b1b Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 31 Aug 2020 17:55:24 +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: I6a09b427b720d6bc28e3e9c5130a0e9b26639f98 --- puppet-{{cookiecutter.project_name}}/manifests/db.pp | 3 --- 1 file changed, 3 deletions(-) diff --git a/puppet-{{cookiecutter.project_name}}/manifests/db.pp b/puppet-{{cookiecutter.project_name}}/manifests/db.pp index 70748a2..bbd5460 100644 --- a/puppet-{{cookiecutter.project_name}}/manifests/db.pp +++ b/puppet-{{cookiecutter.project_name}}/manifests/db.pp @@ -51,9 +51,6 @@ class {{cookiecutter.project_name}}::db ( include {{cookiecutter.project_name}}::deps - validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection, - ['^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?']) - oslo::db { '{{cookiecutter.project_name}}_config': connection => $database_connection, connection_recycle_time => $database_connection_recycle_time,