diff --git a/manifests/config.pp b/manifests/config.pp index 3c459ff..25f6623 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -30,8 +30,8 @@ class congress::config ( include ::congress::deps - validate_hash($congress_config) - validate_hash($congress_api_paste_ini) + validate_legacy(Hash, 'validate_hash', $congress_config) + validate_legacy(Hash, 'validate_hash', $congress_api_paste_ini) create_resources('congress_config', $congress_config) create_resources('congress_api_paste_ini', $congress_api_paste_ini) diff --git a/manifests/db.pp b/manifests/db.pp index e364505..26de847 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -56,8 +56,8 @@ class congress::db ( include ::congress::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 { 'congress_config': connection => $database_connection, diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index 4202333..1041a81 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -45,7 +45,7 @@ class congress::db::mysql( include ::congress::deps - validate_string($password) + validate_legacy(String, 'validate_string', $password) ::openstacklib::db::mysql { 'congress': user => $user, diff --git a/manifests/policy.pp b/manifests/policy.pp index 3ebb4ac..d429a9f 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -31,7 +31,7 @@ class congress::policy ( include ::congress::deps include ::congress::params - validate_hash($policies) + validate_legacy(Hash, 'validate_hash', $policies) Openstacklib::Policy::Base { file_path => $policy_path,