Merge "Use validate_legacy"

This commit is contained in:
Zuul 2019-02-25 17:38:52 +00:00 committed by Gerrit Code Review
commit 29933dbbf0
4 changed files with 6 additions and 6 deletions

View File

@ -33,8 +33,8 @@ class barbican::config (
include ::barbican::deps
validate_hash($api_config)
validate_hash($api_paste_ini_config)
validate_legacy(Hash, 'validate_hash', $api_config)
validate_legacy(Hash, 'validate_hash', $api_paste_ini_config)
create_resources('barbican_config', $api_config)
create_resources('barbican_api_paste_ini', $api_paste_ini_config)

View File

@ -67,8 +67,8 @@ class barbican::db (
include ::barbican::deps
validate_re($database_connection,
'^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?')
validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection,
['^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?'])
oslo::db { 'barbican_config':
connection => $database_connection,

View File

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

View File

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