diff --git a/manifests/config.pp b/manifests/config.pp index 732b5557..c145ecc8 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -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) diff --git a/manifests/db.pp b/manifests/db.pp index 8febe246..72a413c1 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -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, diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index d4d19dbf..410b6f47 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -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, diff --git a/manifests/policy.pp b/manifests/policy.pp index b88ad2ed..41412ceb 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -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,