replace validate_legacy with proper data types

the validate_legacy function is marked for deprecation in
v9.0.0 from puppetlabs-stdlib.

Change-Id: I0808e8a311121e281b20f7493ae6bde6ef0a6929
This commit is contained in:
Takashi Kajinami 2023-06-20 13:31:56 +09:00
parent b740fc30f3
commit 6d2b3f4d04
6 changed files with 8 additions and 21 deletions

View File

@ -21,12 +21,10 @@
# or Puppet catalog compilation will fail with duplicate resources.
#
class zaqar::config (
$zaqar_config = {},
Hash $zaqar_config = {},
) {
include zaqar::deps
validate_legacy(Hash, 'validate_hash', $zaqar_config)
create_resources('zaqar_config', $zaqar_config)
}

View File

@ -34,7 +34,7 @@
# Defaults to 'utf8_general_ci'
#
class zaqar::db::mysql(
$password,
String[1] $password,
$dbname = 'zaqar',
$user = 'zaqar',
$host = '127.0.0.1',
@ -45,8 +45,6 @@ class zaqar::db::mysql(
include zaqar::deps
validate_legacy(String, 'validate_string', $password)
::openstacklib::db::mysql { 'zaqar':
user => $user,
password => $password,

View File

@ -76,7 +76,7 @@
# Defaults to true
#
class zaqar::keystone::auth(
$password,
String[1] $password,
$email = 'zaqar@localhost',
$auth_name = 'zaqar',
$service_name = 'zaqar',
@ -98,8 +98,6 @@ class zaqar::keystone::auth(
include zaqar::deps
validate_legacy(String, 'validate_string', $password)
Keystone::Resource::Service_identity['zaqar'] -> Anchor['zaqar::service::end']
keystone::resource::service_identity { 'zaqar':

View File

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

View File

@ -21,9 +21,9 @@
#
class zaqar::server(
$manage_service = true,
$enabled = true,
$service_name = $::zaqar::params::service_name,
Boolean $manage_service = true,
Boolean $enabled = true,
$service_name = $::zaqar::params::service_name,
) inherits zaqar::params {
include zaqar
@ -31,9 +31,6 @@ class zaqar::server(
include zaqar::params
include zaqar::policy
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)
if $manage_service {
if $enabled {
$ensure = 'running'

View File

@ -13,7 +13,7 @@
#
define zaqar::server_instance(
$transport,
$enabled = true,
Boolean $enabled = true,
) {
if $name == 'zaqar' {
@ -24,8 +24,6 @@ define zaqar::server_instance(
include zaqar::deps
include zaqar::params
validate_legacy(Boolean, 'validate_bool', $enabled)
if $enabled {
$service_ensure = 'running'
} else {