Merge "Use validate_legacy"
This commit is contained in:
commit
eb4445f1c5
|
@ -30,8 +30,8 @@ class magnum::config (
|
|||
|
||||
include ::magnum::deps
|
||||
|
||||
validate_hash($magnum_config)
|
||||
validate_hash($magnum_api_paste_ini)
|
||||
validate_legacy(Hash, 'validate_hash', $magnum_config)
|
||||
validate_legacy(Hash, 'validate_hash', $magnum_api_paste_ini)
|
||||
|
||||
create_resources('magnum_config', $magnum_config)
|
||||
create_resources('magnum_api_paste_ini', $magnum_api_paste_ini)
|
||||
|
|
|
@ -56,8 +56,8 @@ class magnum::db (
|
|||
|
||||
include ::magnum::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 { 'magnum_config':
|
||||
connection => $database_connection,
|
||||
|
|
|
@ -45,7 +45,7 @@ class magnum::db::mysql(
|
|||
|
||||
include ::magnum::deps
|
||||
|
||||
validate_string($password)
|
||||
validate_legacy(String, 'validate_string', $password)
|
||||
|
||||
::openstacklib::db::mysql { 'magnum':
|
||||
user => $user,
|
||||
|
|
|
@ -31,7 +31,7 @@ class magnum::policy (
|
|||
include ::magnum::deps
|
||||
include ::magnum::params
|
||||
|
||||
validate_hash($policies)
|
||||
validate_legacy(Hash, 'validate_hash', $policies)
|
||||
|
||||
Openstacklib::Policy::Base {
|
||||
file_path => $policy_path,
|
||||
|
|
Loading…
Reference in New Issue