remove validate_legacy (Booleans only)

Code Issues Proposed changes

Change-Id: I58de785f83e11d3db2393bdc8dcd240f37e15fdd

This commit is contained in:

Benedikt Trefzer

2023年06月13日 14:14:08 +02:00

parent 72bd48c950

commit fd71263284

3 changed files with 28 additions and 35 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/cache.pp

View File

@@ -236,14 +236,12 @@ define oslo::cache(

$hashclient_retry_attempts=$facts['os_service_default'],

$hashclient_retry_delay=$facts['os_service_default'],

$dead_timeout=$facts['os_service_default'],

$manage_backend_package =true,

Boolean$manage_backend_package=true,

$package_ensure='present',

){

include oslo::params

validate_legacy(Boolean, 'validate_bool', $manage_backend_package)

if is_service_default($memcache_servers) {

$memcache_servers_real = $memcache_servers

}else{

11
manifests/coordination.pp

View File

@@ -21,17 +21,14 @@

#Defaultstotrue.

#

defineoslo::coordination(

$backend_url=$facts['os_service_default'],

$manage_backend_package=true,

$package_ensure='present',

$manage_config=true,

$backend_url =$facts['os_service_default'],

Boolean$manage_backend_package=true,

$package_ensure ='present',

Boolean$manage_config=true,

){

include oslo::params

validate_legacy(Boolean, 'validate_bool', $manage_backend_package)

validate_legacy(Boolean, 'validate_bool', $manage_config)

if $manage_backend_package and !is_service_default($backend_url){

case $backend_url {

/^redis:\/\//: {

48
manifests/db.pp

View File

@@ -108,34 +108,32 @@

#Defaultsto$facts['os_service_default']

#

defineoslo::db(

$config=$name,

$config_group='database',

$sqlite_synchronous=$facts['os_service_default'],

$backend=$facts['os_service_default'],

$manage_backend_package =true,

$backend_package_ensure=present,

$connection=$facts['os_service_default'],

$slave_connection=$facts['os_service_default'],

$mysql_sql_mode=$facts['os_service_default'],

$connection_recycle_time=$facts['os_service_default'],

$max_pool_size=$facts['os_service_default'],

$max_retries=$facts['os_service_default'],

$retry_interval=$facts['os_service_default'],

$max_overflow=$facts['os_service_default'],

$connection_debug=$facts['os_service_default'],

$connection_trace=$facts['os_service_default'],

$pool_timeout=$facts['os_service_default'],

$use_db_reconnect=$facts['os_service_default'],

$db_retry_interval=$facts['os_service_default'],

$db_inc_retry_interval=$facts['os_service_default'],

$db_max_retry_interval=$facts['os_service_default'],

$db_max_retries=$facts['os_service_default'],

$mysql_enable_ndb=$facts['os_service_default'],

$config =$name,

$config_group ='database',

$sqlite_synchronous =$facts['os_service_default'],

$backend =$facts['os_service_default'],

Boolean$manage_backend_package=true,

$backend_package_ensure =present,

$connection =$facts['os_service_default'],

$slave_connection =$facts['os_service_default'],

$mysql_sql_mode =$facts['os_service_default'],

$connection_recycle_time =$facts['os_service_default'],

$max_pool_size =$facts['os_service_default'],

$max_retries =$facts['os_service_default'],

$retry_interval =$facts['os_service_default'],

$max_overflow =$facts['os_service_default'],

$connection_debug =$facts['os_service_default'],

$connection_trace =$facts['os_service_default'],

$pool_timeout =$facts['os_service_default'],

$use_db_reconnect =$facts['os_service_default'],

$db_retry_interval =$facts['os_service_default'],

$db_inc_retry_interval =$facts['os_service_default'],

$db_max_retry_interval =$facts['os_service_default'],

$db_max_retries =$facts['os_service_default'],

$mysql_enable_ndb =$facts['os_service_default'],

){

include oslo::params

validate_legacy(Boolean, 'validate_bool', $manage_backend_package)

if !is_service_default($connection) {

validate_legacy(Oslo::Dbconn, 'validate_re', $connection,