From d07c62fe8f1ada2fb17278bdae00f7a3e9107999 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Thu, 13 Dec 2018 17:10:01 +0800 Subject: [PATCH] Cleanup documentation Make sure documentation is the same and follow the standard which we are trying to enforce on all modules. Change-Id: I1b54aefa27a929946aaf91c6f863466df8b13107 --- manifests/api/logging.pp | 144 +++++++++++++++++----------------- manifests/db/metadefs.pp | 2 +- manifests/db/sync.pp | 2 +- manifests/keystone/auth.pp | 43 ++++++---- manifests/policy.pp | 4 +- manifests/registry/logging.pp | 144 +++++++++++++++++----------------- 6 files changed, 175 insertions(+), 164 deletions(-) diff --git a/manifests/api/logging.pp b/manifests/api/logging.pp index dbef58d6..4bc7ba59 100644 --- a/manifests/api/logging.pp +++ b/manifests/api/logging.pp @@ -4,99 +4,99 @@ # # == 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/glance'. +# [*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/glance'. # -# [*log_file*] -# (optional) File where logs should be stored. -# If set to $::os_service_default, it will not log to any file. -# Defaults to '/var/log/glance/api.log'. +# [*log_file*] +# (Optional) File where logs should be stored. +# If set to $::os_service_default, it will not log to any file. +# Defaults to '/var/log/glance/api.log'. # -# [*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 +# [*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 glance::api::logging( $use_syslog = $::os_service_default, diff --git a/manifests/db/metadefs.pp b/manifests/db/metadefs.pp index 3866252b..f512cb8f 100644 --- a/manifests/db/metadefs.pp +++ b/manifests/db/metadefs.pp @@ -4,7 +4,7 @@ # == Parameters # # [*extra_params*] -# (optional) String of extra command line parameters to append to the +# (Optional) String of extra command line parameters to append to the # glance-manage db_load_metadefs command. These will be inserted in the # command line between 'glance-manage' and 'db_load_metadefs'. # Defaults to '' diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp index d4e6dfe3..184f7df8 100644 --- a/manifests/db/sync.pp +++ b/manifests/db/sync.pp @@ -4,7 +4,7 @@ # == Parameters # # [*extra_params*] -# (optional) String of extra command line parameters to append +# (Optional) String of extra command line parameters to append # to the glance-manage db sync command. These will be inserted # in the command line between 'glance-manage' and 'db sync'. # Defaults to '' diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index 8fc1b572..e2c75d23 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -5,51 +5,62 @@ # == Parameters: # # [*password*] -# Password for glance user. Required. +# (Required) Password for glance user. # # [*email*] -# Email for glance user. Optional. Defaults to 'glance@localhost'. +# (Optional) Email for glance user. +# Defaults to 'glance@localhost'. # # [*auth_name*] -# Username for glance service. Optional. Defaults to 'glance'. +# (Optional) Username for glance service. +# Defaults to 'glance'. # # [*configure_endpoint*] -# Should glance endpoint be configured? Optional. Defaults to 'true'. +# (Optional) Should glance endpoint be configured? +# Defaults to true # # [*configure_user*] -# Should the service user be configured? Optional. Defaults to 'true'. +# (Optional) Should the service user be configured? +# Defaults to true # # [*configure_user_role*] -# Should the admin role be configured for the service user? -# Optional. Defaults to 'true'. +# (Optional) Should the admin role be configured for the service user? +# Defaults to true # # [*service_name*] -# Name of the service. Optional. -# Defaults to 'glance'. +# (Optional) Name of the service. +# Defaults to 'glance' # # [*service_type*] -# Type of service. Optional. Defaults to 'image'. +# (Optional) Type of service. +# Defaults to 'image'. # # [*service_description*] -# Description for keystone service. Optional. Defaults to 'OpenStack Image Service'. +# (Optional) Description for keystone service. +# Defaults to 'OpenStack Image Service'. # # [*region*] -# Region for endpoint. Optional. Defaults to 'RegionOne'. +# (Optional) Region for endpoint. +# Defaults to 'RegionOne'. # # [*tenant*] -# Tenant for glance user. Optional. Defaults to 'services'. +# (Optional) Tenant for glance user. +# Defaults to 'services'. # # [*public_url*] -# (optional) The endpoint's public url. (Defaults to 'http://127.0.0.1:9292') +# (0ptional) The endpoint's public url. # This url should *not* contain any trailing '/'. +# Defaults to 'http://127.0.0.1:9292' # # [*admin_url*] -# (optional) The endpoint's admin url. (Defaults to 'http://127.0.0.1:9292') +# (Optional) The endpoint's admin url. # This url should *not* contain any trailing '/'. +# Defaults to 'http://127.0.0.1:9292' # # [*internal_url*] -# (optional) The endpoint's internal url. (Defaults to 'http://127.0.0.1:9292') +# (Optional) The endpoint's internal url. # This url should *not* contain any trailing '/'. +# Defaults to 'http://127.0.0.1:9292' # # === Examples # diff --git a/manifests/policy.pp b/manifests/policy.pp index bcc1321a..ad207c11 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -5,7 +5,7 @@ # === Parameters # # [*policies*] -# (optional) Set of policies to configure for glance +# (Optional) Set of policies to configure for glance # Example : # { # 'glance-context_is_admin' => { @@ -20,7 +20,7 @@ # Defaults to empty hash. # # [*policy_path*] -# (optional) Path to the glance policy.json file +# (Optional) Path to the glance policy.json file # Defaults to /etc/glance/policy.json # class glance::policy ( diff --git a/manifests/registry/logging.pp b/manifests/registry/logging.pp index e1188005..e64cdd33 100644 --- a/manifests/registry/logging.pp +++ b/manifests/registry/logging.pp @@ -4,99 +4,99 @@ # # == 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/glance'. +# [*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/glance'. # -# [*log_file*] -# (optional) File where logs should be stored. -# If set to $::os_service_default, it will not log to any file. -# Defaults to '/var/log/glance/registry.log'. +# [*log_file*] +# (Optional) File where logs should be stored. +# If set to $::os_service_default, it will not log to any file. +# Defaults to '/var/log/glance/registry.log'. # -# [*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 (false if unconfigured). +# [*publish_errors*] +# (Optional) Publish error events (boolean value). +# Defaults to $::os_service_default (false if unconfigured). # -# [*fatal_deprecations*] -# (optional) Make deprecations fatal (boolean value) -# Defaults to $::os_service_default (false if unconfigured). +# [*fatal_deprecations*] +# (Optional) Make deprecations fatal (boolean value) +# Defaults to $::os_service_default (false if unconfigured). # -# [*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 +# [*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 glance::registry::logging( $use_syslog = $::os_service_default,