diff --git a/manifests/config.pp b/manifests/config.pp index 61ee139..b99af02 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -26,7 +26,7 @@ class mistral::config ( include ::mistral::deps - validate_hash($mistral_config) + validate_legacy(Hash, 'validate_hash', $mistral_config) create_resources('mistral_config', $mistral_config) } diff --git a/manifests/db.pp b/manifests/db.pp index f584ca3..7aac4a2 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -66,8 +66,8 @@ class mistral::db ( $database_retry_interval_real = pick($::mistral::database_retry_interval,$database_retry_interval) $database_max_overflow_real = pick($::mistral::database_max_overflow,$database_max_overflow) - validate_re($database_connection_real, - '^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?') + validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection_real, + ['^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?']) oslo::db { 'mistral_config': connection => $database_connection_real, diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index b0995b6..e826c25 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -45,7 +45,7 @@ class mistral::db::mysql( include ::mistral::deps - validate_string($password) + validate_legacy(String, 'validate_string', $password) ::openstacklib::db::mysql { 'mistral': user => $user, diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index 727ef97..6e05af9 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -83,7 +83,7 @@ class mistral::keystone::auth( include ::mistral::deps - validate_string($password) + validate_legacy(String, 'validate_string', $password) keystone::resource::service_identity { 'mistral': configure_user => $configure_user, diff --git a/manifests/policy.pp b/manifests/policy.pp index 701e36f..3ddddc7 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -31,7 +31,7 @@ class mistral::policy ( include ::mistral::deps include ::mistral::params - validate_hash($policies) + validate_legacy(Hash, 'validate_hash', $policies) Openstacklib::Policy::Base { file_path => $policy_path,