openstack/puppet-placement
Code Issues Proposed changes

replace validate_legacy with proper data types

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

Change-Id: If29a88bdb31e26a6e95cca854385ae0960a5e05f
This commit is contained in:
Benedikt Trefzer 2023-06-02 22:10:41 +02:00
parent 95399aeca0
commit f6ba76c00b
6 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/api.pp
View File

@ -33,21 +33,17 @@
# Defaults to $facts['os_service_default']. # Defaults to $facts['os_service_default'].
# #
class placement::api ( class placement::api (
$enabled = true, Boolean $enabled = true,
$manage_service = true, Boolean $manage_service = true,
$api_service_name = $::placement::params::service_name, $api_service_name = $::placement::params::service_name,
$package_ensure = 'present', $package_ensure = 'present',
$sync_db = false, Boolean $sync_db = false,
$enable_proxy_headers_parsing = $facts['os_service_default'], $enable_proxy_headers_parsing = $facts['os_service_default'],
) inherits placement::params { ) inherits placement::params {
include placement::deps include placement::deps
include placement::policy include placement::policy
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)
validate_legacy(Boolean, 'validate_bool', $sync_db)
if $manage_service { if $manage_service {
if $api_service_name == 'httpd' { if $api_service_name == 'httpd' {
# The following logic is currently required only in Debian, because # The following logic is currently required only in Debian, because

3
manifests/config.pp
View File

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

4
manifests/db/mysql.pp
View File

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

9
manifests/generic_service.pp
View File

@ -33,17 +33,14 @@
define placement::generic_service( define placement::generic_service(
$package_name, $package_name,
$service_name, $service_name,
$enabled = true, Boolean $enabled = true,
$manage_service = true, Boolean $manage_service = true,
$ensure_package = 'present' $ensure_package = 'present'
) { ) {
include placement::deps include placement::deps
include placement::params include placement::params
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)
$placement_title = "placement-${name}" $placement_title = "placement-${name}"
# I need to mark that ths package should be # I need to mark that ths package should be

4
manifests/init.pp
View File

@ -28,7 +28,7 @@
# #
class placement( class placement(
$ensure_package = 'present', $ensure_package = 'present',
$sync_db = true, Boolean $sync_db = true,
$state_path = $facts['os_service_default'], $state_path = $facts['os_service_default'],
$randomize_allocation_candidates = $facts['os_service_default'], $randomize_allocation_candidates = $facts['os_service_default'],
$allocation_conflict_retry_count = $facts['os_service_default'], $allocation_conflict_retry_count = $facts['os_service_default'],
@ -36,8 +36,6 @@ class placement(
include placement::deps include placement::deps
validate_legacy(Boolean, 'validate_bool', $sync_db)
if $sync_db { if $sync_db {
include placement::db::sync include placement::db::sync
} }

4
manifests/policy.pp
View File

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