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
This commit is contained in:
parent
a28cb64fb0
commit
28afa466d7
|
@ -115,7 +115,7 @@ class ceilometer::agent::notification (
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($manage_event_pipeline) {
|
if ($manage_event_pipeline) {
|
||||||
validate_array($event_pipeline_publishers)
|
validate_legacy(Array, 'validate_array', $event_pipeline_publishers)
|
||||||
|
|
||||||
file { 'event_pipeline':
|
file { 'event_pipeline':
|
||||||
ensure => present,
|
ensure => present,
|
||||||
|
@ -130,7 +130,7 @@ class ceilometer::agent::notification (
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($manage_pipeline) {
|
if ($manage_pipeline) {
|
||||||
validate_array($pipeline_publishers)
|
validate_legacy(Array, 'validate_array', $pipeline_publishers)
|
||||||
|
|
||||||
file { 'pipeline':
|
file { 'pipeline':
|
||||||
ensure => present,
|
ensure => present,
|
||||||
|
|
|
@ -32,8 +32,8 @@ class ceilometer::config (
|
||||||
|
|
||||||
include ::ceilometer::deps
|
include ::ceilometer::deps
|
||||||
|
|
||||||
validate_hash($ceilometer_config)
|
validate_legacy(Hash, 'validate_hash', $ceilometer_config)
|
||||||
validate_hash($ceilometer_api_paste_ini)
|
validate_legacy(Hash, 'validate_hash', $ceilometer_api_paste_ini)
|
||||||
|
|
||||||
create_resources('ceilometer_config', $ceilometer_config)
|
create_resources('ceilometer_config', $ceilometer_config)
|
||||||
create_resources('ceilometer_api_paste_ini', $ceilometer_api_paste_ini)
|
create_resources('ceilometer_api_paste_ini', $ceilometer_api_paste_ini)
|
||||||
|
|
|
@ -44,7 +44,7 @@ class ceilometer::db::mysql(
|
||||||
|
|
||||||
include ::ceilometer::deps
|
include ::ceilometer::deps
|
||||||
|
|
||||||
validate_string($password)
|
validate_legacy(String, 'validate_string', $password)
|
||||||
|
|
||||||
::openstacklib::db::mysql { 'ceilometer':
|
::openstacklib::db::mysql { 'ceilometer':
|
||||||
user => $user,
|
user => $user,
|
||||||
|
|
|
@ -89,7 +89,7 @@ class ceilometer::keystone::auth (
|
||||||
|
|
||||||
include ::ceilometer::deps
|
include ::ceilometer::deps
|
||||||
|
|
||||||
validate_string($password)
|
validate_legacy(String, 'validate_string', $password)
|
||||||
|
|
||||||
::keystone::resource::service_identity { 'ceilometer':
|
::keystone::resource::service_identity { 'ceilometer':
|
||||||
configure_user => $configure_user,
|
configure_user => $configure_user,
|
||||||
|
|
|
@ -31,7 +31,7 @@ class ceilometer::policy (
|
||||||
include ::ceilometer::deps
|
include ::ceilometer::deps
|
||||||
include ::ceilometer::params
|
include ::ceilometer::params
|
||||||
|
|
||||||
validate_hash($policies)
|
validate_legacy(Hash, 'validate_hash', $policies)
|
||||||
|
|
||||||
Openstacklib::Policy::Base {
|
Openstacklib::Policy::Base {
|
||||||
file_path => $policy_path,
|
file_path => $policy_path,
|
||||||
|
|
Loading…
Reference in New Issue