Prepare for voxpupuli-puppet-lint-plugins
Fix new lint errors detected when full of the voxpupili lint plugins are enabled. Change-Id: I8ebe256188945780f730ab51fc07ee55d2ecd508 Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
26 changed files with 46 additions and 76 deletions
@@ -22,10 +22,9 @@ define oslo::audit (
$audit_map_file=$facts['os_service_default'],
$ignore_req_list=$facts['os_service_default'],
){
$options = {
'audit/audit_map_file' => {'value' => $audit_map_file},
'audit/ignore_req_list'=>{'value' => join(any2array($ignore_req_list), ',')},
'audit/audit_map_file' => {'value' => $audit_map_file},
'audit/ignore_req_list'=>{'value' => join(any2array($ignore_req_list), ',')},
}
create_resources($config,$options)
}
@@ -253,7 +253,7 @@
#(Optional)ensurestateforpackage.
#Defaultsto'present'
#
defineoslo::cache(
defineoslo::cache(
$config_prefix=$facts['os_service_default'],
$expiration_time=$facts['os_service_default'],
$backend_expiration_time=$facts['os_service_default'],
@@ -295,8 +295,7 @@ define oslo::cache(
$dead_timeout=$facts['os_service_default'],
Boolean$manage_backend_package=true,
$package_ensure='present',
){
){
include oslo::params
if is_service_default($memcache_servers) {
@@ -404,6 +403,5 @@ define oslo::cache(
'cache/hashclient_retry_delay'=>{ value => $hashclient_retry_delay },
'cache/dead_timeout'=>{ value => $dead_timeout },
}
create_resources($name,$cache_options)
}
@@ -17,7 +17,7 @@
#Ifexternallocksareused,alockpathmustbeset.(stringvalue)
#Defaultsto$facts['os_service_default'].
#
defineoslo::concurrency(
defineoslo::concurrency(
$disable_process_locking=$facts['os_service_default'],
$lock_path=$facts['os_service_default'],
){
@@ -26,10 +26,9 @@ define oslo::coordination (
$package_ensure='present',
Boolean$manage_config=true,
){
include oslo::params
if $manage_backend_package and !is_service_default($backend_url){
if $manage_backend_package and !is_service_default($backend_url){
case $backend_url {
/^redis:\/\//: {
stdlib::ensure_packages('python-redis', {
@@ -39,7 +39,7 @@
#(listvalue)
#Defaultsto$facts['os_service_default'].
#
defineoslo::cors(
defineoslo::cors(
$allowed_origin=$facts['os_service_default'],
$allow_credentials=$facts['os_service_default'],
$expose_headers=$facts['os_service_default'],
@@ -47,7 +47,6 @@ define oslo::cors(
$allow_methods=$facts['os_service_default'],
$allow_headers=$facts['os_service_default'],
){
$cors_options = {
'cors/allowed_origin' => { value => join(any2array($allowed_origin), ',') },
'cors/allow_credentials'=>{ value => $allow_credentials },
@@ -111,7 +111,7 @@
#(Optional)Whethertomanagetheconfigurationparameters.
#Defaultstotrue.
#
defineoslo::db(
defineoslo::db(
$config=$name,
String[1]$config_group='database',
$sqlite_synchronous=$facts['os_service_default'],
@@ -137,7 +137,6 @@ define oslo::db(
$mysql_enable_ndb=$facts['os_service_default'],
Boolean$manage_config=true,
){
include oslo::params
if $manage_backend_package {
@@ -194,7 +193,6 @@ define oslo::db(
"${config_group}/db_max_retries"=>{ value => $db_max_retries },
"${config_group}/mysql_enable_ndb"=>{ value => $mysql_enable_ndb },
}
create_resources($config,$database_options)
}
}
@@ -37,7 +37,7 @@
#plugin.
#Defaultsto$facts['os_service_default']
#
defineoslo::healthcheck(
defineoslo::healthcheck(
$detailed=$facts['os_service_default'],
$backends=$facts['os_service_default'],
$allowed_source_ranges=$facts['os_service_default'],
@@ -46,7 +46,6 @@ define oslo::healthcheck(
$disable_by_file_paths=$facts['os_service_default'],
$enable_by_file_paths=$facts['os_service_default'],
){
$backends_real = join(any2array($backends), ',')
$allowed_source_ranges_real = join(any2array($allowed_source_ranges), ',')
$disable_by_file_paths_real = join(any2array($disable_by_file_paths), ',')
@@ -5,7 +5,5 @@
#===Parameters
#
classoslo{
include oslo::params
}
@@ -12,14 +12,12 @@
#(Optional)Specifythekeymanagerimplementation.
#Defaultsto$facts['os_service_default']
#
defineoslo::key_manager(
defineoslo::key_manager(
$config=$name,
$backend=$facts['os_service_default'],
){
$key_manager_options = {
'key_manager/backend' => { value => $backend },
}
create_resources($config,$key_manager_options)
}
@@ -52,7 +52,6 @@ define oslo::key_manager::barbican (
$barbican_region_name=$facts['os_service_default'],
$send_service_user_token=$facts['os_service_default'],
){
$barbican_options = {
'barbican/barbican_endpoint' => { value => $barbican_endpoint },
'barbican/barbican_api_version'=>{ value => $barbican_api_version },
@@ -66,7 +66,7 @@
#(Optional)Theregioninwhichtheidentityservercanbefound.
#Defaultsto$facts['os_service_default'].
#
defineoslo::key_manager::barbican::service_user(
defineoslo::key_manager::barbican::service_user(
$username,
$password,
$auth_url,
@@ -82,7 +82,6 @@ define oslo::key_manager::barbican::service_user(
$keyfile=$facts['os_service_default'],
$region_name=$facts['os_service_default'],
){
if is_service_default($system_scope) {
$project_name_real = $project_name
$project_domain_name_real = $project_domain_name
@@ -94,20 +93,20 @@ define oslo::key_manager::barbican::service_user(
}
$service_user_options={
'barbican_service_user/auth_type' => {'value' => $auth_type},
'barbican_service_user/auth_version'=>{'value' => $auth_version},
'barbican_service_user/cafile'=>{'value' => $cafile},
'barbican_service_user/certfile'=>{'value' => $certfile},
'barbican_service_user/keyfile'=>{'value' => $keyfile},
'barbican_service_user/region_name'=>{'value' => $region_name},
'barbican_service_user/auth_url'=>{'value' => $auth_url},
'barbican_service_user/username'=>{'value' => $username},
'barbican_service_user/password'=>{'value' => $password, 'secret' => true},
'barbican_service_user/user_domain_name'=>{'value' => $user_domain_name},
'barbican_service_user/project_name'=>{'value' => $project_name_real},
'barbican_service_user/project_domain_name'=>{'value' => $project_domain_name_real},
'barbican_service_user/system_scope'=>{'value' => $system_scope},
'barbican_service_user/insecure'=>{'value' => $insecure},
'barbican_service_user/auth_type' => {'value' => $auth_type},
'barbican_service_user/auth_version'=>{'value' => $auth_version},
'barbican_service_user/cafile'=>{'value' => $cafile},
'barbican_service_user/certfile'=>{'value' => $certfile},
'barbican_service_user/keyfile'=>{'value' => $keyfile},
'barbican_service_user/region_name'=>{'value' => $region_name},
'barbican_service_user/auth_url'=>{'value' => $auth_url},
'barbican_service_user/username'=>{'value' => $username},
'barbican_service_user/password'=>{'value' => $password, 'secret' => true},
'barbican_service_user/user_domain_name'=>{'value' => $user_domain_name},
'barbican_service_user/project_name'=>{'value' => $project_name_real},
'barbican_service_user/project_domain_name'=>{'value' => $project_domain_name_real},
'barbican_service_user/system_scope'=>{'value' => $system_scope},
'barbican_service_user/insecure'=>{'value' => $insecure},
}
create_resources($name,$service_user_options)
@@ -71,7 +71,7 @@
#(Optional)AlwaysusethisendpointURLforrequestsforthisclient.
#Defaultsto$facts['os_service_default'].
#
defineoslo::limit(
defineoslo::limit(
String[1]$username,
String[1]$password,
Optional[String[1]]$endpoint_id=undef,
@@ -90,7 +90,6 @@ define oslo::limit(
$region_name=$facts['os_service_default'],
$endpoint_override=$facts['os_service_default'],
){
if delete_undef_values([$endpoint_id, $endpoint_service_name, $endpoint_service_type]) == [] {
fail('Either endpoint_id, endpoint_service_name or endpoint_service_type is required')
}
@@ -106,7 +106,7 @@
#(Optional)Enablesordisablesfatalstatusofdeprecations(booleanvalue).
#Defaultsto$facts['os_service_default']
#
defineoslo::log(
defineoslo::log(
$debug=$facts['os_service_default'],
$log_config_append=$facts['os_service_default'],
$log_date_format=$facts['os_service_default'],
@@ -127,8 +127,7 @@ define oslo::log(
$instance_format=$facts['os_service_default'],
$instance_uuid_format=$facts['os_service_default'],
$fatal_deprecations=$facts['os_service_default'],
){
){
$default_log_levels_real = $default_log_levels ? {
Hash => join(sort(join_keys_to_values($default_log_levels, '=')), ','),
Array => join(sort($default_log_levels), ','),
@@ -30,13 +30,12 @@
#Defaultsto$facts['os_service_default'].
#
defineoslo::messaging::default(
defineoslo::messaging::default(
$executor_thread_pool_size=$facts['os_service_default'],
$rpc_response_timeout=$facts['os_service_default'],
Oslo::TransportURL$transport_url=$facts['os_service_default'],
$control_exchange=$facts['os_service_default'],
){
$default_options = {
'DEFAULT/executor_thread_pool_size' => { value => $executor_thread_pool_size },
'DEFAULT/rpc_response_timeout'=>{ value => $rpc_response_timeout },
@@ -32,13 +32,12 @@
#message,whichfailedtobedeliveredduetoarecoverableerror.
#Defaultsto$facts['os_service_default'].
#
defineoslo::messaging::notifications(
defineoslo::messaging::notifications(
$driver=$facts['os_service_default'],
Oslo::TransportURL$transport_url=$facts['os_service_default'],
$topics=$facts['os_service_default'],
$retry=$facts['os_service_default'],
){
# When we have a string value for driver, we keep passing it as string
# to reduce any chance of breaking things in a backwards incompatible way
$driver_real = $driver ? {
@@ -163,7 +163,7 @@
#willberunthroughagreenthread.
#Defaultstoundef
#
defineoslo::messaging::rabbit(
defineoslo::messaging::rabbit(
$amqp_durable_queues=$facts['os_service_default'],
$amqp_auto_delete=$facts['os_service_default'],
$kombu_ssl_version=$facts['os_service_default'],
@@ -196,8 +196,7 @@ define oslo::messaging::rabbit(
$rabbit_stream_fanout=$facts['os_service_default'],
#DEPRECATEDPARAMETERS
$heartbeat_in_pthread=undef,
){
){
if $heartbeat_in_pthread != undef {
warning('The heartbeat_in_pthread parameter is deprecated.')
}
@@ -22,7 +22,7 @@
#(stringvalue)
#Defaultsto$facts['os_service_default'].
#
defineoslo::middleware(
defineoslo::middleware(
#sizelimit
$max_request_body_size=$facts['os_service_default'],
#http_proxy_to_wsgi
@@ -17,12 +17,11 @@
#(Optional)IntervalvaluetowaitformultipathdevicetobereadyforI/O.
#Defaultsto$facts['os_service_default']
#
defineoslo::os_brick(
defineoslo::os_brick(
$lock_path=$facts['os_service_default'],
$wait_mpath_device_attempts=$facts['os_service_default'],
$wait_mpath_device_interval=$facts['os_service_default'],
){
$os_brick_options = {
'os_brick/lock_path' => { value => $lock_path },
'os_brick/wait_mpath_device_attempts'=>{ value => $wait_mpath_device_attempts },
@@ -31,6 +31,5 @@ class oslo::params {
default:{
fail("Unsupported osfamily: ${facts['os']['family']}")
}
}#Case$facts['os']['family']
}
@@ -33,14 +33,13 @@
#Missingoremptydirectoriesareignored.(listvalue)
#Defaultsto$facts['os_service_default'].
#
defineoslo::policy(
defineoslo::policy(
$enforce_scope=$facts['os_service_default'],
$enforce_new_defaults=$facts['os_service_default'],
$policy_file=$facts['os_service_default'],
$policy_default_rule=$facts['os_service_default'],
$policy_dirs=$facts['os_service_default'],
){
$policy_options = {
'oslo_policy/enforce_scope' => { value => $enforce_scope },
'oslo_policy/enforce_new_defaults'=>{ value => $enforce_new_defaults },
@@ -48,6 +47,5 @@ define oslo::policy(
'oslo_policy/policy_default_rule'=>{ value => $policy_default_rule },
'oslo_policy/policy_dirs'=>{ value => $policy_dirs },
}
create_resources($name,$policy_options)
}
@@ -66,7 +66,6 @@ define oslo::privsep (
$helper_command=$facts['os_service_default'],
$logger_name=$facts['os_service_default'],
){
$privsep_options = {
"${config_group}/user"=>{ value => $user },
"${config_group}/group"=>{ value => $group },
@@ -75,6 +74,5 @@ define oslo::privsep (
"${config_group}/helper_command"=>{ value => $helper_command },
"${config_group}/logger_name"=>{ value => $logger_name },
}
create_resources($config,$privsep_options)
}
@@ -29,7 +29,7 @@
#(Optional)Manageoslo.reportspackage.
#Defaultstofalse
#
defineoslo::reports(
defineoslo::reports(
$config=$name,
$log_dir=$facts['os_service_default'],
$file_event_handler=$facts['os_service_default'],
@@ -37,15 +37,8 @@ define oslo::reports(
$package_ensure='present',
Boolean$manage_package=false,
){
include oslo::params
$oslo_reports_options = {
'oslo_reports/log_dir' => { value => $log_dir },
'oslo_reports/file_event_handler'=>{ value => $file_event_handler },
'oslo_reports/file_event_handler_interval'=>{ value => $file_event_handler_interval },
}
if $manage_package {
stdlib::ensure_packages( 'oslo.reports', {
name => $oslo::params::oslo_reports_package_name,
@@ -54,5 +47,10 @@ define oslo::reports(
})
}
$oslo_reports_options={
'oslo_reports/log_dir' => { value => $log_dir },
'oslo_reports/file_event_handler'=>{ value => $file_event_handler },
'oslo_reports/file_event_handler_interval'=>{ value => $file_event_handler_interval },
}
create_resources($config,$oslo_reports_options)
}
@@ -38,7 +38,6 @@ define oslo::service (
$log_options=$facts['os_service_default'],
$run_external_periodic_tasks=$facts['os_service_default'],
){
$service_options = {
'DEFAULT/backdoor_port' => { value => $backdoor_port },
'DEFAULT/backdoor_socket'=>{ value => $backdoor_socket },
@@ -46,6 +45,5 @@ define oslo::service (
'DEFAULT/log_options'=>{ value => $log_options },
'DEFAULT/run_external_periodic_tasks'=>{ value => $run_external_periodic_tasks },
}
create_resources($name,$service_options)
}
@@ -39,7 +39,6 @@ define oslo::service::ssl (
$key_file=$facts['os_service_default'],
$version=$facts['os_service_default'],
){
if is_service_default($cert_file) != is_service_default($key_file) {
fail('Both of cert_file and key_file should be set or unset.')
}
@@ -51,6 +50,5 @@ define oslo::service::ssl (
'ssl/key_file'=>{ value => $key_file },
'ssl/version'=>{ value => $version },
}
create_resources($name,$service_options)
}
@@ -51,7 +51,6 @@ define oslo::service::wsgi (
$wsgi_keep_alive=$facts['os_service_default'],
$wsgi_log_format=$facts['os_service_default'],
){
$service_options = {
'DEFAULT/api_paste_config' => { value => $api_paste_config },
'DEFAULT/client_socket_timeout'=>{ value => $client_socket_timeout },
@@ -61,6 +60,5 @@ define oslo::service::wsgi (
'DEFAULT/wsgi_keep_alive'=>{ value => $wsgi_keep_alive },
'DEFAULT/wsgi_log_format'=>{ value => $wsgi_log_format },
}
create_resources($name,$service_options)
}
@@ -11,8 +11,11 @@
#(Optional)Makeexceptionmessageformaterrorsfatal.(booleanvalue)
#Defaultsto$facts['os_service_default'].
#
defineoslo::versionedobjects(
defineoslo::versionedobjects(
$fatal_exception_format_errors=$facts['os_service_default'],
){
create_resources($name, {'oslo_versionedobjects/fatal_exception_format_errors' => { value => $fatal_exception_format_errors }})
$ovo_options = {
'oslo_versionedobjects/fatal_exception_format_errors' => { value => $fatal_exception_format_errors },
}
create_resources($name,$ovo_options)
}
Reference in New Issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.