From 9330559217a98a85e73b58958a9e673d3beba368 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Sat, 23 Feb 2019 22:27:37 +0100 Subject: [PATCH] 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: Ifa0c404af3868e87668f4587febd41617eb4ba1c --- manifests/repo/redhat/redhat.pp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/manifests/repo/redhat/redhat.pp b/manifests/repo/redhat/redhat.pp index 6fe406e..2bbfa5c 100644 --- a/manifests/repo/redhat/redhat.pp +++ b/manifests/repo/redhat/redhat.pp @@ -80,15 +80,15 @@ class openstack_extras::repo::redhat::redhat( $centos_mirror_url = 'http://mirror.centos.org', ) inherits openstack_extras::repo::redhat::params { - validate_string($release) - validate_bool($manage_rdo) - validate_bool($manage_epel) - validate_hash($repo_hash) - validate_hash($repo_defaults) - validate_hash($gpgkey_hash) - validate_hash($gpgkey_defaults) - validate_bool($purge_unmanaged) - validate_bool($package_require) + validate_legacy(String, 'validate_string', $release) + validate_legacy(Boolean, 'validate_bool', $manage_rdo) + validate_legacy(Boolean, 'validate_bool', $manage_epel) + validate_legacy(Hash, 'validate_hash', $repo_hash) + validate_legacy(Hash, 'validate_hash', $repo_defaults) + validate_legacy(Hash, 'validate_hash', $gpgkey_hash) + validate_legacy(Hash, 'validate_hash', $gpgkey_defaults) + validate_legacy(Boolean, 'validate_bool', $purge_unmanaged) + validate_legacy(Boolean, 'validate_bool', $package_require) $_repo_defaults = merge($::openstack_extras::repo::redhat::params::repo_defaults, $repo_defaults) $_gpgkey_defaults = merge($::openstack_extras::repo::redhat::params::gpgkey_defaults, $gpgkey_defaults)