diff --git a/manifests/audit.pp b/manifests/audit.pp index 049f7c4..ebb9cd9 100644 --- a/manifests/audit.pp +++ b/manifests/audit.pp @@ -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) } diff --git a/manifests/cache.pp b/manifests/cache.pp index a5fba9d..116785a 100644 --- a/manifests/cache.pp +++ b/manifests/cache.pp @@ -253,7 +253,7 @@ # (Optional) ensure state for package. # Defaults to 'present' # -define oslo::cache( +define oslo::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) } diff --git a/manifests/concurrency.pp b/manifests/concurrency.pp index 22f7359..cde4be5 100644 --- a/manifests/concurrency.pp +++ b/manifests/concurrency.pp @@ -17,7 +17,7 @@ # If external locks are used, a lock path must be set. (string value) # Defaults to $facts['os_service_default']. # -define oslo::concurrency( +define oslo::concurrency ( $disable_process_locking = $facts['os_service_default'], $lock_path = $facts['os_service_default'], ) { diff --git a/manifests/coordination.pp b/manifests/coordination.pp index 0a3b9ee..9bf100d 100644 --- a/manifests/coordination.pp +++ b/manifests/coordination.pp @@ -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', { diff --git a/manifests/cors.pp b/manifests/cors.pp index 56f78c2..7dc7a09 100644 --- a/manifests/cors.pp +++ b/manifests/cors.pp @@ -39,7 +39,7 @@ # (list value) # Defaults to $facts['os_service_default']. # -define oslo::cors( +define oslo::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 }, diff --git a/manifests/db.pp b/manifests/db.pp index 7073183..8c4de37 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -111,7 +111,7 @@ # (Optional) Whether to manage the configuration parameters. # Defaults to true. # -define oslo::db( +define oslo::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) } } diff --git a/manifests/healthcheck.pp b/manifests/healthcheck.pp index c1dc2fe..dcdd167 100644 --- a/manifests/healthcheck.pp +++ b/manifests/healthcheck.pp @@ -37,7 +37,7 @@ # plugin. # Defaults to $facts['os_service_default'] # -define oslo::healthcheck( +define oslo::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), ',') diff --git a/manifests/init.pp b/manifests/init.pp index be5f729..61c7065 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -5,7 +5,5 @@ # === Parameters # class oslo { - include oslo::params - } diff --git a/manifests/key_manager.pp b/manifests/key_manager.pp index 87e61e5..82513ca 100644 --- a/manifests/key_manager.pp +++ b/manifests/key_manager.pp @@ -12,14 +12,12 @@ # (Optional) Specify the key manager implementation. # Defaults to $facts['os_service_default'] # -define oslo::key_manager( +define oslo::key_manager ( $config = $name, $backend = $facts['os_service_default'], ) { - $key_manager_options = { 'key_manager/backend' => { value => $backend }, } - create_resources($config, $key_manager_options) } diff --git a/manifests/key_manager/barbican.pp b/manifests/key_manager/barbican.pp index 1956bcc..d05d1e4 100644 --- a/manifests/key_manager/barbican.pp +++ b/manifests/key_manager/barbican.pp @@ -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 }, diff --git a/manifests/key_manager/barbican/service_user.pp b/manifests/key_manager/barbican/service_user.pp index 925fea6..7b87a6f 100644 --- a/manifests/key_manager/barbican/service_user.pp +++ b/manifests/key_manager/barbican/service_user.pp @@ -66,7 +66,7 @@ # (Optional) The region in which the identity server can be found. # Defaults to $facts['os_service_default']. # -define oslo::key_manager::barbican::service_user( +define oslo::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) diff --git a/manifests/limit.pp b/manifests/limit.pp index 825a1ae..3e24a2c 100644 --- a/manifests/limit.pp +++ b/manifests/limit.pp @@ -71,7 +71,7 @@ # (Optional) Always use this endpoint URL for requests for this client. # Defaults to $facts['os_service_default']. # -define oslo::limit( +define oslo::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') } diff --git a/manifests/log.pp b/manifests/log.pp index af22715..cfda381 100644 --- a/manifests/log.pp +++ b/manifests/log.pp @@ -106,7 +106,7 @@ # (Optional) Enables or disables fatal status of deprecations (boolean value). # Defaults to $facts['os_service_default'] # -define oslo::log( +define oslo::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), ','), diff --git a/manifests/messaging/default.pp b/manifests/messaging/default.pp index 3f0eb75..bd7b0df 100644 --- a/manifests/messaging/default.pp +++ b/manifests/messaging/default.pp @@ -30,13 +30,12 @@ # Defaults to $facts['os_service_default']. # -define oslo::messaging::default( +define oslo::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 }, diff --git a/manifests/messaging/notifications.pp b/manifests/messaging/notifications.pp index ffb9af4..a624b6a 100644 --- a/manifests/messaging/notifications.pp +++ b/manifests/messaging/notifications.pp @@ -32,13 +32,12 @@ # message, which failed to be delivered due to a recoverable error. # Defaults to $facts['os_service_default']. # -define oslo::messaging::notifications( +define oslo::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 ? { diff --git a/manifests/messaging/rabbit.pp b/manifests/messaging/rabbit.pp index 568dc82..c76d2fb 100644 --- a/manifests/messaging/rabbit.pp +++ b/manifests/messaging/rabbit.pp @@ -163,7 +163,7 @@ # will be run through a green thread. # Defaults to undef # -define oslo::messaging::rabbit( +define oslo::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'], # DEPRECATED PARAMETERS $heartbeat_in_pthread = undef, -){ - +) { if $heartbeat_in_pthread != undef { warning('The heartbeat_in_pthread parameter is deprecated.') } diff --git a/manifests/middleware.pp b/manifests/middleware.pp index 0b08942..032cd31 100644 --- a/manifests/middleware.pp +++ b/manifests/middleware.pp @@ -22,7 +22,7 @@ # (string value) # Defaults to $facts['os_service_default']. # -define oslo::middleware( +define oslo::middleware ( # sizelimit $max_request_body_size = $facts['os_service_default'], # http_proxy_to_wsgi diff --git a/manifests/os_brick.pp b/manifests/os_brick.pp index 21cff0c..42f2489 100644 --- a/manifests/os_brick.pp +++ b/manifests/os_brick.pp @@ -17,12 +17,11 @@ # (Optional) Interval value to wait for multipath device to be ready for I/O. # Defaults to $facts['os_service_default'] # -define oslo::os_brick( +define oslo::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 }, diff --git a/manifests/params.pp b/manifests/params.pp index 908f2f3..6208375 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -31,6 +31,5 @@ class oslo::params { default: { fail("Unsupported osfamily: ${facts['os']['family']}") } - } # Case $facts['os']['family'] } diff --git a/manifests/policy.pp b/manifests/policy.pp index 07a483b..55a1df9 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -33,14 +33,13 @@ # Missing or empty directories are ignored. (list value) # Defaults to $facts['os_service_default']. # -define oslo::policy( +define oslo::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) } diff --git a/manifests/privsep.pp b/manifests/privsep.pp index 7de981e..d64c1e4 100644 --- a/manifests/privsep.pp +++ b/manifests/privsep.pp @@ -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) } diff --git a/manifests/reports.pp b/manifests/reports.pp index f0cc02e..7f225fb 100644 --- a/manifests/reports.pp +++ b/manifests/reports.pp @@ -29,7 +29,7 @@ # (Optional) Manage oslo.reports package. # Defaults to false # -define oslo::reports( +define oslo::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) } diff --git a/manifests/service.pp b/manifests/service.pp index 4da8978..6a33bb3 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -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) } diff --git a/manifests/service/ssl.pp b/manifests/service/ssl.pp index 6173036..525bee2 100644 --- a/manifests/service/ssl.pp +++ b/manifests/service/ssl.pp @@ -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) } diff --git a/manifests/service/wsgi.pp b/manifests/service/wsgi.pp index 0a9b877..b6ae20e 100644 --- a/manifests/service/wsgi.pp +++ b/manifests/service/wsgi.pp @@ -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) } diff --git a/manifests/versionedobjects.pp b/manifests/versionedobjects.pp index 717a2ab..bfaae3b 100644 --- a/manifests/versionedobjects.pp +++ b/manifests/versionedobjects.pp @@ -11,8 +11,11 @@ # (Optional) Make exception message format errors fatal. (boolean value) # Defaults to $facts['os_service_default']. # -define oslo::versionedobjects( +define oslo::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) }

AltStyle によって変換されたページ (->オリジナル) /