Merge "Use validate_legacy"

This commit is contained in:
Zuul 2019-02-25 19:21:33 +00:00 committed by Gerrit Code Review
commit 11627782d4
5 changed files with 6 additions and 6 deletions

View File

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

View File

@ -66,8 +66,8 @@ class mistral::db (
$database_retry_interval_real = pick($::mistral::database_retry_interval,$database_retry_interval)
$database_max_overflow_real = pick($::mistral::database_max_overflow,$database_max_overflow)
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+)?'])
oslo::db { 'mistral_config':
connection => $database_connection_real,

View File

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

View File

@ -83,7 +83,7 @@ class mistral::keystone::auth(
include ::mistral::deps
validate_string($password)
validate_legacy(String, 'validate_string', $password)
keystone::resource::service_identity { 'mistral':
configure_user => $configure_user,

View File

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