diff --git a/manifests/config.pp b/manifests/config.pp index 64ba372..b5a6451 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -30,8 +30,8 @@ class glare::config ( include ::glare::deps - validate_hash($glare_config) - validate_hash($glare_paste_ini_config) + validate_legacy(Hash, 'validate_hash', $glare_config) + validate_legacy(Hash, 'validate_hash', $glare_paste_ini_config) create_resources('glare_config', $glare_config) create_resources('glare_paste_ini', $glare_paste_ini_config) diff --git a/manifests/db.pp b/manifests/db.pp index 143a5f5..d644afd 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -56,8 +56,8 @@ class glare::db ( include ::glare::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 { 'glare_config': connection => $database_connection, diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index bddad7e..f21a1a2 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -45,7 +45,7 @@ class glare::db::mysql( include ::glare::deps - validate_string($password) + validate_legacy(String, 'validate_string', $password) ::openstacklib::db::mysql { 'glare': user => $user, diff --git a/manifests/policy.pp b/manifests/policy.pp index 1e7948e..e3c780d 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -31,7 +31,7 @@ class glare::policy ( include ::glare::deps include ::glare::params - validate_hash($policies) + validate_legacy(Hash, 'validate_hash', $policies) Openstacklib::Policy::Base { file_path => $policy_path,