openstack/puppet-gnocchi
Code Issues Proposed changes

Replace remaining validate_legacy

Browse Source 
These were somehow overlooked during the previous attempt.

Change-Id: I742afd3b162cc1a6fe8975d3c83a180f6474c7b9
This commit is contained in:
Takashi Kajinami 2023-07-13 22:05:09 +09:00
parent fea62d44e9
commit 4f5423407a
5 changed files with 16 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/api.pp
View File

@ -56,12 +56,12 @@
# Defaults to $facts['os_service_default'].
#
class gnocchi::api (
$manage_service = true,
$enabled = true,
Boolean $manage_service = true,
Boolean $enabled = true,
$package_ensure = 'present',
$max_limit = $facts['os_service_default'],
$service_name = $::gnocchi::params::api_service_name,
$sync_db = false,
Boolean $sync_db = false,
$auth_strategy = 'keystone',
$paste_config = $facts['os_service_default'],
$operation_timeout = $facts['os_service_default'],
@ -72,10 +72,6 @@ class gnocchi::api (
include gnocchi::deps
include gnocchi::policy
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)
validate_legacy(Boolean, 'validate_bool', $sync_db)
package { 'gnocchi-api':
ensure => $package_ensure,
name => $::gnocchi::params::api_package_name,

7
manifests/config.pp
View File

@ -24,15 +24,12 @@
# or Puppet catalog compilation will fail with duplicate resources.
#
class gnocchi::config (
$gnocchi_config = {},
$gnocchi_api_paste_ini = {},
Hash $gnocchi_config = {},
Hash $gnocchi_api_paste_ini = {},
) {
include gnocchi::deps
validate_legacy(Hash, 'validate_hash', $gnocchi_config)
validate_legacy(Hash, 'validate_hash', $gnocchi_api_paste_ini)
create_resources('gnocchi_config', $gnocchi_config)
create_resources('gnocchi_api_paste_ini', $gnocchi_api_paste_ini)
}

7
manifests/metricd.pp
View File

@ -40,8 +40,8 @@
# Defaults to true.
#
class gnocchi::metricd (
$manage_service = true,
$enabled = true,
Boolean $manage_service = true,
Boolean $enabled = true,
$workers = $facts['os_workers'],
$metric_processing_delay = $facts['os_service_default'],
$greedy = $facts['os_service_default'],
@ -53,9 +53,6 @@ class gnocchi::metricd (
include gnocchi::deps
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)
gnocchi_config {
'metricd/workers': value => $workers;
'metricd/metric_processing_delay': value => $metric_processing_delay;

4
manifests/policy.pp
View File

@ -48,7 +48,7 @@
class gnocchi::policy (
$enforce_scope = $facts['os_service_default'],
$enforce_new_defaults = $facts['os_service_default'],
$policies = {},
Hash $policies = {},
$policy_path = '/etc/gnocchi/policy.yaml',
$policy_default_rule = $facts['os_service_default'],
$policy_dirs = $facts['os_service_default'],
@ -58,8 +58,6 @@ class gnocchi::policy (
include gnocchi::deps
include gnocchi::params
validate_legacy(Hash, 'validate_hash', $policies)
$policy_parameters = {
policies => $policies,
policy_path => $policy_path,

19
manifests/statsd.pp
View File

@ -39,21 +39,18 @@
#
class gnocchi::statsd (
$resource_id,
$host = $facts['os_service_default'],
$port = $facts['os_service_default'],
$flush_delay = $facts['os_service_default'],
$archive_policy_name = $facts['os_service_default'],
$creator = $facts['os_service_default'],
$manage_service = true,
$enabled = true,
$package_ensure = 'present',
$host = $facts['os_service_default'],
$port = $facts['os_service_default'],
$flush_delay = $facts['os_service_default'],
$archive_policy_name = $facts['os_service_default'],
$creator = $facts['os_service_default'],
Boolean $manage_service = true,
Boolean $enabled = true,
$package_ensure = 'present',
) inherits gnocchi::params {
include gnocchi::deps
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)
package { 'gnocchi-statsd':
ensure => $package_ensure,
name => $::gnocchi::params::statsd_package_name,