openstack/puppet-octavia
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: Ic85570b69ab3aa538d3fd4dd365a4c18717447c5
This commit is contained in:
Takashi Kajinami
2023-06-21 10:18:49 +09:00
parent 27b7a44bf2
commit 0ca00adff7
9 changed files with 36 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/api.pp
View File

@@ -122,8 +122,8 @@
# Defaults to undef # Defaults to undef
# #
class octavia::api ( class octavia::api (
$enabled = true, Boolean $enabled = true,
$manage_service = true, Boolean $manage_service = true,
$service_name = $::octavia::params::api_service_name, $service_name = $::octavia::params::api_service_name,
$host = '0.0.0.0', $host = '0.0.0.0',
$port = '9876', $port = '9876',
@@ -133,7 +133,7 @@ class octavia::api (
$api_v1_enabled = $facts['os_service_default'], $api_v1_enabled = $facts['os_service_default'],
$api_v2_enabled = $facts['os_service_default'], $api_v2_enabled = $facts['os_service_default'],
$allow_tls_terminated_listeners = $facts['os_service_default'], $allow_tls_terminated_listeners = $facts['os_service_default'],
$sync_db = false, Boolean $sync_db = false,
$enable_proxy_headers_parsing = $facts['os_service_default'], $enable_proxy_headers_parsing = $facts['os_service_default'],
$default_provider_driver = $facts['os_service_default'], $default_provider_driver = $facts['os_service_default'],
$enabled_provider_drivers = $facts['os_service_default'], $enabled_provider_drivers = $facts['os_service_default'],
@@ -156,10 +156,6 @@ class octavia::api (
include octavia::policy include octavia::policy
include octavia::db include octavia::db
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)
validate_legacy(Boolean, 'validate_bool', $sync_db)
if $provider_drivers != undef { if $provider_drivers != undef {
warning('The provider_drivers parameter is deprecated. \ warning('The provider_drivers parameter is deprecated. \
Use the enabled_provider_drivers parameter instead.') Use the enabled_provider_drivers parameter instead.')

4
manifests/config.pp
View File

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

7
manifests/controller.pp
View File

@@ -256,7 +256,7 @@
# Defaults to undef # Defaults to undef
# #
class octavia::controller ( class octavia::controller (
$heartbeat_key, String[1] $heartbeat_key,
$amp_active_retries = $facts['os_service_default'], $amp_active_retries = $facts['os_service_default'],
$amp_active_wait_sec = $facts['os_service_default'], $amp_active_wait_sec = $facts['os_service_default'],
$amp_flavor_id = '65', $amp_flavor_id = '65',
@@ -274,7 +274,7 @@ class octavia::controller (
$amphora_delete_retries = $facts['os_service_default'], $amphora_delete_retries = $facts['os_service_default'],
$amphora_delete_retry_interval = $facts['os_service_default'], $amphora_delete_retry_interval = $facts['os_service_default'],
$event_notifications = $facts['os_service_default'], $event_notifications = $facts['os_service_default'],
$enable_ssh_access = true, Boolean $enable_ssh_access = true,
$amp_ssh_key_name = 'octavia-ssh-key', $amp_ssh_key_name = 'octavia-ssh-key',
$timeout_client_data = $facts['os_service_default'], $timeout_client_data = $facts['os_service_default'],
$timeout_member_connect = $facts['os_service_default'], $timeout_member_connect = $facts['os_service_default'],
@@ -318,9 +318,6 @@ class octavia::controller (
include octavia::deps include octavia::deps
include octavia::db include octavia::db
validate_legacy(String, 'validate_string', $heartbeat_key)
validate_legacy(Boolean, 'validate_bool', $enable_ssh_access)
if ! is_service_default($loadbalancer_topology) and if ! is_service_default($loadbalancer_topology) and
! ($loadbalancer_topology in ['SINGLE', 'ACTIVE_STANDBY']) { ! ($loadbalancer_topology in ['SINGLE', 'ACTIVE_STANDBY']) {
fail('load balancer topology must be one of SINGLE or ACTIVE_STANDBY') fail('load balancer topology must be one of SINGLE or ACTIVE_STANDBY')

4
manifests/db/mysql.pp
View File

@@ -38,7 +38,7 @@
# Defaults to 'utf8_general_ci' # Defaults to 'utf8_general_ci'
# #
class octavia::db::mysql( class octavia::db::mysql(
$password, String[1] $password,
$dbname = 'octavia', $dbname = 'octavia',
$persistence_dbname = undef, $persistence_dbname = undef,
$user = 'octavia', $user = 'octavia',
@@ -50,8 +50,6 @@ class octavia::db::mysql(
include octavia::deps include octavia::deps
validate_legacy(String, 'validate_string', $password)
::openstacklib::db::mysql { 'octavia': ::openstacklib::db::mysql { 'octavia':
user => $user, user => $user,
password => $password, password => $password,

7
manifests/driver_agent.pp
View File

@@ -69,8 +69,8 @@
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
class octavia::driver_agent ( class octavia::driver_agent (
$manage_service = true, Boolean $manage_service = true,
$enabled = true, Boolean $enabled = true,
$package_ensure = 'present', $package_ensure = 'present',
$status_socket_path = $facts['os_service_default'], $status_socket_path = $facts['os_service_default'],
$stats_socket_path = $facts['os_service_default'], $stats_socket_path = $facts['os_service_default'],
@@ -89,9 +89,6 @@ class octavia::driver_agent (
include octavia::deps include octavia::deps
include octavia::params include octavia::params
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)
package { 'octavia-driver-agent': package { 'octavia-driver-agent':
ensure => $package_ensure, ensure => $package_ensure,
name => $::octavia::params::driver_agent_package_name, name => $::octavia::params::driver_agent_package_name,

29
manifests/health_manager.pp
View File

@@ -58,29 +58,26 @@
# Defaults to undef # Defaults to undef
# #
class octavia::health_manager ( class octavia::health_manager (
$manage_service = true, Boolean $manage_service = true,
$enabled = true, Boolean $enabled = true,
$package_ensure = 'present', $package_ensure = 'present',
$ip = $facts['os_service_default'], $ip = $facts['os_service_default'],
$port = $facts['os_service_default'], $port = $facts['os_service_default'],
$health_update_threads = $facts['os_workers'], $health_update_threads = $facts['os_workers'],
$stats_update_threads = $facts['os_workers'], $stats_update_threads = $facts['os_workers'],
$failover_threads = $facts['os_service_default'], $failover_threads = $facts['os_service_default'],
$heartbeat_timeout = $facts['os_service_default'], $heartbeat_timeout = $facts['os_service_default'],
$health_check_interval = $facts['os_service_default'], $health_check_interval = $facts['os_service_default'],
$sock_rlimit = $facts['os_service_default'], $sock_rlimit = $facts['os_service_default'],
$failover_threshold = $facts['os_service_default'], $failover_threshold = $facts['os_service_default'],
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$workers = undef, $workers = undef,
) { ) {
include octavia::deps include octavia::deps
include octavia::params include octavia::params
include octavia::controller include octavia::controller
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)
package { 'octavia-health-manager': package { 'octavia-health-manager':
ensure => $package_ensure, ensure => $package_ensure,
name => $::octavia::params::health_manager_package_name, name => $::octavia::params::health_manager_package_name,

7
manifests/housekeeping.pp
View File

@@ -39,8 +39,8 @@
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
class octavia::housekeeping ( class octavia::housekeeping (
$manage_service = true, Boolean $manage_service = true,
$enabled = true, Boolean $enabled = true,
$package_ensure = 'present', $package_ensure = 'present',
$cleanup_interval = $facts['os_service_default'], $cleanup_interval = $facts['os_service_default'],
$amphora_expiry_age = $facts['os_service_default'], $amphora_expiry_age = $facts['os_service_default'],
@@ -53,9 +53,6 @@ class octavia::housekeeping (
include octavia::deps include octavia::deps
include octavia::params include octavia::params
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)
package { 'octavia-housekeeping': package { 'octavia-housekeeping':
ensure => $package_ensure, ensure => $package_ensure,
name => $::octavia::params::housekeeping_package_name, name => $::octavia::params::housekeeping_package_name,

4
manifests/policy.pp
View File

@@ -48,7 +48,7 @@
class octavia::policy ( class octavia::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/octavia/policy.yaml', $policy_path = '/etc/octavia/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 octavia::policy (
include octavia::deps include octavia::deps
include octavia::params include octavia::params
validate_legacy(Hash, 'validate_hash', $policies)
$policy_parameters = { $policy_parameters = {
policies => $policies, policies => $policies,
policy_path => $policy_path, policy_path => $policy_path,

28
manifests/worker.pp
View File

@@ -52,29 +52,23 @@
# Defaults to 'services' # Defaults to 'services'
# #
class octavia::worker ( class octavia::worker (
$manage_service = true, Boolean $manage_service = true,
$enabled = true, Boolean $enabled = true,
$package_ensure = 'present', $package_ensure = 'present',
$workers = $facts['os_workers'], $workers = $facts['os_workers'],
$manage_nova_flavor = true, Boolean $manage_nova_flavor = true,
$nova_flavor_config = {}, Hash $nova_flavor_config = {},
$key_path = '/etc/octavia/.ssh/octavia_ssh_key', $key_path = '/etc/octavia/.ssh/octavia_ssh_key',
$manage_keygen = false, Boolean $manage_keygen = false,
$ssh_key_type = 'rsa', $ssh_key_type = 'rsa',
$ssh_key_bits = 2048, $ssh_key_bits = 2048,
$amp_project_name = 'services', $amp_project_name = 'services',
) { ) {
include octavia::deps include octavia::deps
include octavia::params include octavia::params
include octavia::controller include octavia::controller
validate_legacy(Boolean, 'validate_bool', $manage_service)
validate_legacy(Boolean, 'validate_bool', $enabled)
validate_legacy(Boolean, 'validate_bool', $manage_nova_flavor)
validate_legacy(Hash, 'validate_hash', $nova_flavor_config)
validate_legacy(Boolean, 'validate_bool', $manage_keygen)
if ! $::octavia::controller::amp_flavor_id { if ! $::octavia::controller::amp_flavor_id {
if $manage_nova_flavor { if $manage_nova_flavor {
fail('When managing Nova flavor, octavia::controller::amp_flavor_id is required.') fail('When managing Nova flavor, octavia::controller::amp_flavor_id is required.')