openstack
/
puppet-rally
Code Issues Proposed changes

Merge "Use validate_legacy"

This commit is contained in:
Zuul 2019-02-25 17:43:07 +00:00 committed by Gerrit Code Review
parent e9a490e0b4 c0bf5b5fb1
commit 5f38a3855e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/config.pp
View File

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

4
manifests/db.pp
View File

@ -64,8 +64,8 @@ class rally::db (
$database_retry_interval_real = pick($::rally::database_retry_interval, $database_retry_interval)
$database_max_overflow_real = pick($::rally::database_max_overflow, $database_max_overflow)
validate_re($database_connection_real,
'(sqlite|mysql|postgresql):\/\/(\S+:\S+@\S+\/\S+)?')
validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection_real,
['(sqlite|mysql|postgresql):\/\/(\S+:\S+@\S+\/\S+)?'])
# This is only for rally SQLite
if $database_connection_real =~ /^sqlite:\/\// {

2
manifests/db/mysql.pp
View File

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