diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index 106c836a..9f65be8a 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -5,80 +5,98 @@ # === Parameters # # [*password*] -# Password for Manila user. Required. +# (Required) Password for Manila user. # # [*email*] -# Email for Manila user. Optional. Defaults to 'manila@localhost'. +# (Optional) Email for Manila user. +# Defaults to 'manila@localhost'. # # [*auth_name*] -# Username for Manila service. Optional. Defaults to 'manila'. +# (Optional) Username for Manila service. +# Defaults to 'manila'. # # [*service_name*] -# (optional) Name of the service. +# (Optional) Name of the service. # Defaults to 'manila'. # # [*service_name_v2*] -# (optional) Name of the service. +# (Optional) Name of the service. # Defaults to 'manilav2'. # # [*configure_endpoint*] -# [*configure_endpoint*] -# Should Manila endpoint be configured? Optional. Defaults to 'true'. +# Should Manila endpoint be configured? Optional. # API v1 endpoint should be enabled in Icehouse for compatibility with Nova. +# Defaults to true # # [*service_type*] -# Type of service. Optional. Defaults to 'share'. +# (Optional) Type of service. +# Defaults to 'share'. # # [*service_description*] -# Description for keystone service. Optional. Defaults to 'Manila Service'. +# (Optional) Description for keystone service. +# Defaults to 'Manila Service'. # # [*region*] -# Region for endpoint. Optional. Defaults to 'RegionOne'. +# (Optional) Region for endpoint. +# Defaults to 'RegionOne'. # # [*tenant*] -# Tenant for Manila user. Optional. Defaults to 'services'. +# (Optional) Tenant for Manila user. +# Defaults to 'services'. # # [*public_url*] -# (optional) The endpoint's public url. (Defaults to 'http://127.0.0.1:8786/v1/%(tenant_id)s') +# (0ptional) The endpoint's public url. # This url should *not* contain any trailing '/'. +# Defaults to 'http://127.0.0.1:8786/v1/%(tenant_id)s' # # [*admin_url*] -# (optional) The endpoint's admin url. (Defaults to 'http://127.0.0.1:8786/v1/%(tenant_id)s') +# (Optional) The endpoint's admin url. # This url should *not* contain any trailing '/'. +# Defaults to 'http://127.0.0.1:8786/v1/%(tenant_id)s' # # [*internal_url*] -# (optional) The endpoint's internal url. (Defaults to 'http://127.0.0.1:8786/v1/%(tenant_id)s') +# (Optional) The endpoint's internal url. # This url should *not* contain any trailing '/'. +# Defaults to 'http://127.0.0.1:8786/v1/%(tenant_id)s' # # [*password_v2*] -# Password for Manila v2 user. Optional. Defaults to undef. +# (Optional) Password for Manila v2 user. +# Defaults to undef. # # [*email_v2*] -# Email for Manila v2 user. Optional. Defaults to 'manilav2@localhost'. +# (Optional) Email for Manila v2 user. +# Defaults to 'manilav2@localhost'. # # [*auth_name_v2*] -# Username for Manila v2 service. Optional. Defaults to 'manilav2'. +# (Optional) Username for Manila v2 service. +# Defaults to 'manilav2'. # # [*configure_endpoint_v2*] -# Should Manila v2 endpoint be configured? Optional. Defaults to 'true'. +# (Optional) Should Manila v2 endpoint be configured? +# Defaults to true. # # [*service_type_v2*] -# Type of service v2. Optional. Defaults to 'sharev2'. +# (Optional) Type of service v2. Optional. +# Defaults to 'sharev2'. # # [*service_description_v2*] -# Description for keystone service v2. Optional. Defaults to 'Manila Service v2'. +# (Optional) Description for keystone service v2. +# Defaults to 'Manila Service v2'. # # [*public_url_v2*] -# (optional) The v2 endpoint's public url. (Defaults to 'http://127.0.0.1:8786/v2/%(tenant_id)s') +# (Optional) The v2 endpoint's public url. # This url should *not* contain any trailing '/'. +# Defaults to 'http://127.0.0.1:8786/v2/%(tenant_id)s' # # [*admin_url_v2*] -# (optional) The endpoint's admin url. (Defaults to 'http://127.0.0.1:8786/v2/%(tenant_id)s') +# (Optional) The endpoint's admin url. # This url should *not* contain any trailing '/'. +# Defaults to 'http://127.0.0.1:8786/v2/%(tenant_id)s' # # [*internal_url_v2*] -# (optional) The endpoint's internal url. (Defaults to 'http://127.0.0.1:8786/v2/%(tenant_id)s') +# (Optional) The endpoint's internal url. # This url should *not* contain any trailing '/'. +# Defaults to 'http://127.0.0.1:8786/v2/%(tenant_id)s' # # === Examples # diff --git a/manifests/logging.pp b/manifests/logging.pp index b79d7307..dbda5582 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -4,94 +4,94 @@ # # == parameters # -# [*debug*] -# (Optional) Should the daemons log debug messages -# Defaults to $::os_service_default +# [*debug*] +# (Optional) Should the daemons log debug messages +# Defaults to $::os_service_default # -# [*use_syslog*] -# (Optional) Use syslog for logging. -# Defaults to $::os_service_default +# [*use_syslog*] +# (Optional) Use syslog for logging. +# Defaults to $::os_service_default # -# [*use_json*] -# (Optional) Use json for logging. -# Defaults to $::os_service_default +# [*use_json*] +# (Optional) Use json for logging. +# Defaults to $::os_service_default # -# [*use_journal*] -# (Optional) Use journal for logging. -# Defaults to $::os_service_default +# [*use_journal*] +# (Optional) Use journal for logging. +# Defaults to $::os_service_default # -# [*use_stderr*] -# (optional) Use stderr for logging -# Defaults to $::os_service_default +# [*use_stderr*] +# (Optional) Use stderr for logging +# Defaults to $::os_service_default # -# [*log_facility*] -# (Optional) Syslog facility to receive log lines. -# Defaults to $::os_service_default +# [*log_facility*] +# (Optional) Syslog facility to receive log lines. +# Defaults to $::os_service_default # -# [*log_dir*] -# (optional) Directory where logs should be stored. -# If set to $::os_service_default, it will not log to any directory. -# Defaults to '/var/log/manila' +# [*log_dir*] +# (Optional) Directory where logs should be stored. +# If set to $::os_service_default, it will not log to any directory. +# Defaults to '/var/log/manila' # -# [*logging_context_format_string*] -# (optional) Format string to use for log messages with context. -# Defaults to $::os_service_default -# Example: '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s\ -# [%(request_id)s %(user_identity)s] %(instance)s%(message)s' +# [*logging_context_format_string*] +# (Optional) Format string to use for log messages with context. +# Defaults to $::os_service_default +# Example: '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s\ +# [%(request_id)s %(user_identity)s] %(instance)s%(message)s' # -# [*logging_default_format_string*] -# (optional) Format string to use for log messages without context. -# Defaults to $::os_service_default -# Example: '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s\ -# [-] %(instance)s%(message)s' +# [*logging_default_format_string*] +# (Optional) Format string to use for log messages without context. +# Defaults to $::os_service_default +# Example: '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s\ +# [-] %(instance)s%(message)s' # -# [*logging_debug_format_suffix*] -# (optional) Formatted data to append to log format when level is DEBUG. -# Defaults to $::os_service_default -# Example: '%(funcName)s %(pathname)s:%(lineno)d' +# [*logging_debug_format_suffix*] +# (Optional) Formatted data to append to log format when level is DEBUG. +# Defaults to $::os_service_default +# Example: '%(funcName)s %(pathname)s:%(lineno)d' # -# [*logging_exception_prefix*] -# (optional) Prefix each line of exception output with this format. -# Defaults to $::os_service_default -# Example: '%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s' +# [*logging_exception_prefix*] +# (Optional) Prefix each line of exception output with this format. +# Defaults to $::os_service_default +# Example: '%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s' # -# [*log_config_append*] -# The name of an additional logging configuration file. -# Defaults to $::os_service_default -# See https://docs.python.org/2/howto/logging.html +# [*log_config_append*] +# (Optional) The name of an additional logging configuration file. +# Defaults to $::os_service_default +# See https://docs.python.org/2/howto/logging.html # -# [*default_log_levels*] -# (optional) Hash of logger (keys) and level (values) pairs. -# Defaults to $::os_service_default -# Example: -# { 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN', -# 'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN', -# 'requests.packages.urllib3.connectionpool' => 'WARN' } +# [*default_log_levels*] +# (0ptional) Hash of logger (keys) and level (values) pairs. +# Defaults to $::os_service_default +# Example: +# { 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN', +# 'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN', +# 'requests.packages.urllib3.connectionpool' => 'WARN' } # -# [*publish_errors*] -# (optional) Publish error events (boolean value). -# Defaults to $::os_service_default +# [*publish_errors*] +# (Optional) Publish error events (boolean value). +# Defaults to $::os_service_default # -# [*fatal_deprecations*] -# (optional) Make deprecations fatal (boolean value) -# Defaults to $::os_service_default +# [*fatal_deprecations*] +# (Optional) Make deprecations fatal (boolean value) +# Defaults to $::os_service_default # -# [*instance_format*] -# (optional) If an instance is passed with the log message, format it -# like this (string value). -# Defaults to $::os_service_default -# Example: '[instance: %(uuid)s] ' +# [*instance_format*] +# (Optional) If an instance is passed with the log message, format it +# like this (string value). +# Defaults to $::os_service_default +# Example: '[instance: %(uuid)s] ' # -# [*instance_uuid_format*] -# (optional) If an instance UUID is passed with the log message, format -# it like this (string value). -# Defaults to $::os_service_default -# Example: instance_uuid_format='[instance: %(uuid)s] ' +# [*instance_uuid_format*] +# (Optional) If an instance UUID is passed with the log message, format +# it like this (string value). +# Defaults to $::os_service_default +# Example: instance_uuid_format='[instance: %(uuid)s] ' # -# [*log_date_format*] -# (optional) Format string for %%(asctime)s in log records. -# Defaults to $::os_service_default -# Example: 'Y-%m-%d %H:%M:%S' +# [*log_date_format*] +# (Optional) Format string for %%(asctime)s in log records. +# Defaults to $::os_service_default +# Example: 'Y-%m-%d %H:%M:%S' # class manila::logging( $use_syslog = $::os_service_default, diff --git a/manifests/policy.pp b/manifests/policy.pp index 509a22bc..8b5a87bd 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -5,7 +5,7 @@ # === Parameters # # [*policies*] -# (optional) Set of policies to configure for manila +# (Optional) Set of policies to configure for manila # Example : # { # 'manila-context_is_admin' => { @@ -20,7 +20,7 @@ # Defaults to empty hash. # # [*policy_path*] -# (optional) Path to the manila policy.json file +# (Optional) Path to the manila policy.json file # Defaults to /etc/manila/policy.json # class manila::policy (