Use validate_legacy

This changes all the puppet 3 validate_* functions
to use the validate_legacy function.

The validate_legacy function has been available since
about three years but require Puppet >= 4.4.0 and since
there is Puppet 4.10.12 as latest we should assume people
are running a fairly new Puppet 4 version.

This is the first step to then remove all validate function
calls and use proper types for parameter as described in spec [1].

[1] https://review.openstack.org/#/c/568929/

Change-Id: Ib6f668fed59f8285edafa67f12135fc5032e8f72
This commit is contained in:
Tobias Urdin 2019-02-10 13:59:13 +01:00
parent dca57ab7fd
commit 457ded9269
4 changed files with 6 additions and 6 deletions

View File

@ -30,8 +30,8 @@ class cloudkitty::config (
include ::cloudkitty::deps
validate_hash($cloudkitty_config)
validate_hash($cloudkitty_api_paste_ini)
validate_legacy(Hash, 'validate_hash', $cloudkitty_config)
validate_legacy(Hash, 'validate_hash', $cloudkitty_api_paste_ini)
create_resources('cloudkitty_config', $cloudkitty_config)
create_resources('cloudkitty_api_paste_ini', $cloudkitty_api_paste_ini)

View File

@ -56,8 +56,8 @@ class cloudkitty::db (
include ::cloudkitty::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 { 'cloudkitty_config':
connection => $database_connection,

View File

@ -45,7 +45,7 @@ class cloudkitty::db::mysql(
include ::cloudkitty::deps
validate_string($password)
validate_legacy(String, 'validate_string', $password)
::openstacklib::db::mysql { 'cloudkitty':
user => $user,

View File

@ -31,7 +31,7 @@ class cloudkitty::policy (
include ::cloudkitty::deps
include ::cloudkitty::params
validate_hash($policies)
validate_legacy(Hash, 'validate_hash', $policies)
Openstacklib::Policy::Base {
file_path => $policy_path,