diff --git a/manifests/config.pp b/manifests/config.pp index f7767b6..e60ee16 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -30,8 +30,8 @@ class panko::config ( include ::panko::deps - validate_hash($panko_config) - validate_hash($panko_api_paste_ini) + validate_legacy(Hash, 'validate_hash', $panko_config) + validate_legacy(Hash, 'validate_hash', $panko_api_paste_ini) create_resources('panko_config', $panko_config) create_resources('panko_api_paste_ini', $panko_api_paste_ini) diff --git a/manifests/db.pp b/manifests/db.pp index 0a36874..b5a3802 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -56,8 +56,8 @@ class panko::db ( include ::panko::deps - validate_re($database_connection, - '^(sqlite|mysql(\+pymysql)?|postgresql(\+psycopg2)?):\/\/(\S+:\S+@\S+\/\S+)?') + validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection, + ['^(sqlite|mysql(\+pymysql)?|postgresql(\+psycopg2)?):\/\/(\S+:\S+@\S+\/\S+)?']) oslo::db { 'panko_config': connection => $database_connection, diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index b0e4761..b411784 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -45,7 +45,7 @@ class panko::db::mysql( include ::panko::deps - validate_string($password) + validate_legacy(String, 'validate_string', $password) ::openstacklib::db::mysql { 'panko': user => $user, diff --git a/manifests/policy.pp b/manifests/policy.pp index 603a0d6..600405c 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -31,7 +31,7 @@ class panko::policy ( include ::panko::deps include ::panko::params - validate_hash($policies) + validate_legacy(Hash, 'validate_hash', $policies) Openstacklib::Policy::Base { file_path => $policy_path,