Merge "Use validate_legacy"

This commit is contained in:
Zuul 2019-02-25 17:59:38 +00:00 committed by Gerrit Code Review
commit e1f8a6955f
4 changed files with 5 additions and 5 deletions

View File

@ -26,7 +26,7 @@ class gnocchi::config (
include ::gnocchi::deps
validate_hash($gnocchi_config)
validate_legacy(Hash, 'validate_hash', $gnocchi_config)
create_resources('gnocchi_config', $gnocchi_config)
}

View File

@ -23,8 +23,8 @@ class gnocchi::db (
# to use gnocchi::<myparam> if gnocchi::db::<myparam> isn't specified.
$database_connection_real = pick($::gnocchi::database_connection, $database_connection)
validate_re($database_connection_real,
'^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?')
validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection_real,
['^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?'])
if $database_connection_real {
case $database_connection_real {

View File

@ -45,7 +45,7 @@ class gnocchi::db::mysql(
include ::gnocchi::deps
validate_string($password)
validate_legacy(String, 'validate_string', $password)
::openstacklib::db::mysql { 'gnocchi':
user => $user,

View File

@ -31,7 +31,7 @@ class gnocchi::policy (
include ::gnocchi::deps
include ::gnocchi::params
validate_hash($policies)
validate_legacy(Hash, 'validate_hash', $policies)
Openstacklib::Policy::Base {
file_path => $policy_path,