diff --git a/manifests/config.pp b/manifests/config.pp index 51359892..6c3d39cf 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -30,8 +30,8 @@ class sahara::config ( include ::sahara::deps - validate_hash($sahara_config) - validate_hash($sahara_api_paste_ini) + validate_legacy(Hash, 'validate_hash', $sahara_config) + validate_legacy(Hash, 'validate_hash', $sahara_api_paste_ini) create_resources('sahara_config', $sahara_config) create_resources('sahara_api_paste_ini', $sahara_api_paste_ini) diff --git a/manifests/db.pp b/manifests/db.pp index b42a178f..4817bf5c 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -66,8 +66,8 @@ class sahara::db ( $database_retry_interval_real = pick($::sahara::database_retry_interval, $database_retry_interval) $database_max_overflow_real = pick($::sahara::database_max_overflow, $database_max_overflow) - validate_re($database_connection_real, - '^(mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?') + validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection_real, + ['^(mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?']) oslo::db { 'sahara_config': db_max_retries => $database_db_max_retries, diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index ce7b1def..356c0807 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -44,7 +44,7 @@ class sahara::db::mysql( include ::sahara::deps - validate_string($password) + validate_legacy(String, 'validate_string', $password) ::openstacklib::db::mysql{ 'sahara': user => $user, diff --git a/manifests/policy.pp b/manifests/policy.pp index fa5c4b0b..50745699 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -31,7 +31,7 @@ class sahara::policy ( include ::sahara::deps include ::sahara::params - validate_hash($policies) + validate_legacy(Hash, 'validate_hash', $policies) Openstacklib::Policy::Base { file_path => $policy_path,