From: Tobias Urdin <tobias.urdin@binero.se>
Date: Sun, 10 Feb 2019 12:47:02 +0000 (+0100)
Subject: Use validate_legacy
X-Git-Tag: 14.3.0~2^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=28afa466d74fffa567bbad12ec164ae097fd963a;p=puppet-modules%2Fpuppet-ceilometer.git

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: I640d5ca592774601a252dbafbdc90bc98313055b
---

diff --git a/manifests/agent/notification.pp b/manifests/agent/notification.pp
index 01b230c..792e6e7 100644
--- a/manifests/agent/notification.pp
+++ b/manifests/agent/notification.pp
@@ -115,7 +115,7 @@ class ceilometer::agent::notification (
   }
 
   if ($manage_event_pipeline) {
-    validate_array($event_pipeline_publishers)
+    validate_legacy(Array, 'validate_array', $event_pipeline_publishers)
 
     file { 'event_pipeline':
       ensure                  => present,
@@ -130,7 +130,7 @@ class ceilometer::agent::notification (
   }
 
   if ($manage_pipeline) {
-    validate_array($pipeline_publishers)
+    validate_legacy(Array, 'validate_array', $pipeline_publishers)
 
     file { 'pipeline':
       ensure                  => present,
diff --git a/manifests/config.pp b/manifests/config.pp
index 2c0e975..ae10513 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -32,8 +32,8 @@ class ceilometer::config (
 
   include ::ceilometer::deps
 
-  validate_hash($ceilometer_config)
-  validate_hash($ceilometer_api_paste_ini)
+  validate_legacy(Hash, 'validate_hash', $ceilometer_config)
+  validate_legacy(Hash, 'validate_hash', $ceilometer_api_paste_ini)
 
   create_resources('ceilometer_config', $ceilometer_config)
   create_resources('ceilometer_api_paste_ini', $ceilometer_api_paste_ini)
diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index d534bd2..abf8e4c 100644
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -44,7 +44,7 @@ class ceilometer::db::mysql(
 
   include ::ceilometer::deps
 
-  validate_string($password)
+  validate_legacy(String, 'validate_string', $password)
 
   ::openstacklib::db::mysql { 'ceilometer':
     user          => $user,
diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index a9abe8c..d6cd687 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -89,7 +89,7 @@ class ceilometer::keystone::auth (
 
   include ::ceilometer::deps
 
-  validate_string($password)
+  validate_legacy(String, 'validate_string', $password)
 
   ::keystone::resource::service_identity { 'ceilometer':
     configure_user      => $configure_user,
diff --git a/manifests/policy.pp b/manifests/policy.pp
index 417a993..9ee1ba0 100644
--- a/manifests/policy.pp
+++ b/manifests/policy.pp
@@ -31,7 +31,7 @@ class ceilometer::policy (
   include ::ceilometer::deps
   include ::ceilometer::params
 
-  validate_hash($policies)
+  validate_legacy(Hash, 'validate_hash', $policies)
 
   Openstacklib::Policy::Base {
     file_path  => $policy_path,