Merge "Cleaned up config generator settings"
This commit is contained in:
commit
1366594bd8
|
@ -1,5 +1,103 @@
|
||||||
[DEFAULT]
|
[DEFAULT]
|
||||||
|
|
||||||
|
#
|
||||||
|
# From log.config
|
||||||
|
#
|
||||||
|
|
||||||
|
# Print debugging output (set logging level to DEBUG instead of
|
||||||
|
# default WARNING level). (boolean value)
|
||||||
|
#debug = false
|
||||||
|
|
||||||
|
# Print more verbose output (set logging level to INFO instead of
|
||||||
|
# default WARNING level). (boolean value)
|
||||||
|
#verbose = false
|
||||||
|
|
||||||
|
#
|
||||||
|
# From log.config
|
||||||
|
#
|
||||||
|
|
||||||
|
# The name of a logging configuration file. This file is appended to
|
||||||
|
# any existing logging configuration files. For details about logging
|
||||||
|
# configuration files, see the Python logging module documentation.
|
||||||
|
# (string value)
|
||||||
|
# Deprecated group/name - [DEFAULT]/log_config
|
||||||
|
#log_config_append = <None>
|
||||||
|
|
||||||
|
# DEPRECATED. A logging.Formatter log message format string which may
|
||||||
|
# use any of the available logging.LogRecord attributes. This option
|
||||||
|
# is deprecated. Please use logging_context_format_string and
|
||||||
|
# logging_default_format_string instead. (string value)
|
||||||
|
#log_format = <None>
|
||||||
|
|
||||||
|
# Format string for %%(asctime)s in log records. Default: %(default)s
|
||||||
|
# . (string value)
|
||||||
|
#log_date_format = %Y-%m-%d %H:%M:%S
|
||||||
|
|
||||||
|
# (Optional) Name of log file to output to. If no default is set,
|
||||||
|
# logging will go to stdout. (string value)
|
||||||
|
# Deprecated group/name - [DEFAULT]/logfile
|
||||||
|
#log_file = <None>
|
||||||
|
|
||||||
|
# (Optional) The base directory used for relative --log-file paths.
|
||||||
|
# (string value)
|
||||||
|
# Deprecated group/name - [DEFAULT]/logdir
|
||||||
|
#log_dir = <None>
|
||||||
|
|
||||||
|
# Use syslog for logging. Existing syslog format is DEPRECATED during
|
||||||
|
# I, and will change in J to honor RFC5424. (boolean value)
|
||||||
|
#use_syslog = false
|
||||||
|
|
||||||
|
# (Optional) Enables or disables syslog rfc5424 format for logging. If
|
||||||
|
# enabled, prefixes the MSG part of the syslog message with APP-NAME
|
||||||
|
# (RFC5424). The format without the APP-NAME is deprecated in I, and
|
||||||
|
# will be removed in J. (boolean value)
|
||||||
|
#use_syslog_rfc_format = false
|
||||||
|
|
||||||
|
# Syslog facility to receive log lines. (string value)
|
||||||
|
#syslog_log_facility = LOG_USER
|
||||||
|
|
||||||
|
#
|
||||||
|
# From log.config
|
||||||
|
#
|
||||||
|
|
||||||
|
# Log output to standard error. (boolean value)
|
||||||
|
#use_stderr = true
|
||||||
|
|
||||||
|
#
|
||||||
|
# From log.config
|
||||||
|
#
|
||||||
|
|
||||||
|
# Format string to use for log messages with context. (string value)
|
||||||
|
#logging_context_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s
|
||||||
|
|
||||||
|
# Format string to use for log messages without context. (string
|
||||||
|
# value)
|
||||||
|
#logging_default_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s
|
||||||
|
|
||||||
|
# Data to append to log format when level is DEBUG. (string value)
|
||||||
|
#logging_debug_format_suffix = %(funcName)s %(pathname)s:%(lineno)d
|
||||||
|
|
||||||
|
# Prefix each line of exception output with this format. (string
|
||||||
|
# value)
|
||||||
|
#logging_exception_prefix = %(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s
|
||||||
|
|
||||||
|
# List of logger=LEVEL pairs. (list value)
|
||||||
|
#default_log_levels = amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,urllib3.connectionpool=WARN,websocket=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN
|
||||||
|
|
||||||
|
# Enables or disables publication of error events. (boolean value)
|
||||||
|
#publish_errors = false
|
||||||
|
|
||||||
|
# Enables or disables fatal status of deprecations. (boolean value)
|
||||||
|
#fatal_deprecations = false
|
||||||
|
|
||||||
|
# The format for an instance that is passed with the log message.
|
||||||
|
# (string value)
|
||||||
|
#instance_format = "[instance: %(uuid)s] "
|
||||||
|
|
||||||
|
# The format for an instance UUID that is passed with the log message.
|
||||||
|
# (string value)
|
||||||
|
#instance_uuid_format = "[instance: %(uuid)s] "
|
||||||
|
|
||||||
#
|
#
|
||||||
# From oslo.messaging
|
# From oslo.messaging
|
||||||
#
|
#
|
||||||
|
@ -179,7 +277,33 @@
|
||||||
#control_exchange = openstack
|
#control_exchange = openstack
|
||||||
|
|
||||||
#
|
#
|
||||||
# From sahara
|
# From periodic.config
|
||||||
|
#
|
||||||
|
|
||||||
|
# Some periodic tasks can be run in a separate process. Should we run
|
||||||
|
# them here? (boolean value)
|
||||||
|
#run_external_periodic_tasks = true
|
||||||
|
|
||||||
|
#
|
||||||
|
# From policy.config
|
||||||
|
#
|
||||||
|
|
||||||
|
# The JSON file that defines policies. (string value)
|
||||||
|
#policy_file = policy.json
|
||||||
|
|
||||||
|
# Default rule. Enforced when a requested rule is not found. (string
|
||||||
|
# value)
|
||||||
|
#policy_default_rule = default
|
||||||
|
|
||||||
|
# Directories where policy configuration files are stored. They can be
|
||||||
|
# relative to any directory in the search path defined by the
|
||||||
|
# config_dir option, or absolute paths. The file defined by
|
||||||
|
# policy_file must exist for these directories to be searched. (multi
|
||||||
|
# valued)
|
||||||
|
#policy_dirs = policy.d
|
||||||
|
|
||||||
|
#
|
||||||
|
# From sahara.config
|
||||||
#
|
#
|
||||||
|
|
||||||
# Hostname or IP address that will be used to listen on. (string
|
# Hostname or IP address that will be used to listen on. (string
|
||||||
|
@ -233,106 +357,6 @@
|
||||||
# Driver to use for database access. (string value)
|
# Driver to use for database access. (string value)
|
||||||
#db_driver = sahara.db
|
#db_driver = sahara.db
|
||||||
|
|
||||||
# The JSON file that defines policies. (string value)
|
|
||||||
#policy_file = policy.json
|
|
||||||
|
|
||||||
# Default rule. Enforced when a requested rule is not found. (string
|
|
||||||
# value)
|
|
||||||
#policy_default_rule = default
|
|
||||||
|
|
||||||
# Directories where policy configuration files are stored. They can be
|
|
||||||
# relative to any directory in the search path defined by the
|
|
||||||
# config_dir option, or absolute paths. The file defined by
|
|
||||||
# policy_file must exist for these directories to be searched. (multi
|
|
||||||
# valued)
|
|
||||||
#policy_dirs = policy.d
|
|
||||||
|
|
||||||
# Print debugging output (set logging level to DEBUG instead of
|
|
||||||
# default WARNING level). (boolean value)
|
|
||||||
#debug = false
|
|
||||||
|
|
||||||
# Print more verbose output (set logging level to INFO instead of
|
|
||||||
# default WARNING level). (boolean value)
|
|
||||||
#verbose = false
|
|
||||||
|
|
||||||
# Log output to standard error. (boolean value)
|
|
||||||
#use_stderr = true
|
|
||||||
|
|
||||||
# Format string to use for log messages with context. (string value)
|
|
||||||
#logging_context_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s
|
|
||||||
|
|
||||||
# Format string to use for log messages without context. (string
|
|
||||||
# value)
|
|
||||||
#logging_default_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s
|
|
||||||
|
|
||||||
# Data to append to log format when level is DEBUG. (string value)
|
|
||||||
#logging_debug_format_suffix = %(funcName)s %(pathname)s:%(lineno)d
|
|
||||||
|
|
||||||
# Prefix each line of exception output with this format. (string
|
|
||||||
# value)
|
|
||||||
#logging_exception_prefix = %(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s
|
|
||||||
|
|
||||||
# List of logger=LEVEL pairs. (list value)
|
|
||||||
#default_log_levels = amqplib=WARN,qpid.messaging=INFO,stevedore=INFO,eventlet.wsgi.server=WARN,sqlalchemy=WARN,boto=WARN,suds=INFO,keystone=INFO,paramiko=WARN,requests=WARN,iso8601=WARN
|
|
||||||
|
|
||||||
# Enables or disables publication of error events. (boolean value)
|
|
||||||
#publish_errors = false
|
|
||||||
|
|
||||||
# Enables or disables fatal status of deprecations. (boolean value)
|
|
||||||
#fatal_deprecations = false
|
|
||||||
|
|
||||||
# The format for an instance that is passed with the log message.
|
|
||||||
# (string value)
|
|
||||||
#instance_format = "[instance: %(uuid)s] "
|
|
||||||
|
|
||||||
# The format for an instance UUID that is passed with the log message.
|
|
||||||
# (string value)
|
|
||||||
#instance_uuid_format = "[instance: %(uuid)s] "
|
|
||||||
|
|
||||||
# The name of a logging configuration file. This file is appended to
|
|
||||||
# any existing logging configuration files. For details about logging
|
|
||||||
# configuration files, see the Python logging module documentation.
|
|
||||||
# (string value)
|
|
||||||
# Deprecated group/name - [DEFAULT]/log_config
|
|
||||||
#log_config_append = <None>
|
|
||||||
|
|
||||||
# DEPRECATED. A logging.Formatter log message format string which may
|
|
||||||
# use any of the available logging.LogRecord attributes. This option
|
|
||||||
# is deprecated. Please use logging_context_format_string and
|
|
||||||
# logging_default_format_string instead. (string value)
|
|
||||||
#log_format = <None>
|
|
||||||
|
|
||||||
# Format string for %%(asctime)s in log records. Default: %(default)s
|
|
||||||
# . (string value)
|
|
||||||
#log_date_format = %Y-%m-%d %H:%M:%S
|
|
||||||
|
|
||||||
# (Optional) Name of log file to output to. If no default is set,
|
|
||||||
# logging will go to stdout. (string value)
|
|
||||||
# Deprecated group/name - [DEFAULT]/logfile
|
|
||||||
#log_file = <None>
|
|
||||||
|
|
||||||
# (Optional) The base directory used for relative --log-file paths.
|
|
||||||
# (string value)
|
|
||||||
# Deprecated group/name - [DEFAULT]/logdir
|
|
||||||
#log_dir = <None>
|
|
||||||
|
|
||||||
# Use syslog for logging. Existing syslog format is DEPRECATED during
|
|
||||||
# I, and will change in J to honor RFC5424. (boolean value)
|
|
||||||
#use_syslog = false
|
|
||||||
|
|
||||||
# (Optional) Enables or disables syslog rfc5424 format for logging. If
|
|
||||||
# enabled, prefixes the MSG part of the syslog message with APP-NAME
|
|
||||||
# (RFC5424). The format without the APP-NAME is deprecated in I, and
|
|
||||||
# will be removed in J. (boolean value)
|
|
||||||
#use_syslog_rfc_format = false
|
|
||||||
|
|
||||||
# Syslog facility to receive log lines. (string value)
|
|
||||||
#syslog_log_facility = LOG_USER
|
|
||||||
|
|
||||||
# Some periodic tasks can be run in a separate process. Should we run
|
|
||||||
# them here? (boolean value)
|
|
||||||
#run_external_periodic_tasks = true
|
|
||||||
|
|
||||||
# List of plugins to be loaded. Sahara preserves the order of the list
|
# List of plugins to be loaded. Sahara preserves the order of the list
|
||||||
# when returning it. (list value)
|
# when returning it. (list value)
|
||||||
#plugins = vanilla,hdp,spark
|
#plugins = vanilla,hdp,spark
|
||||||
|
@ -388,10 +412,6 @@
|
||||||
# (string value)
|
# (string value)
|
||||||
#proxy_command =
|
#proxy_command =
|
||||||
|
|
||||||
#
|
|
||||||
# From sahara_main
|
|
||||||
#
|
|
||||||
|
|
||||||
# Region name used to get services endpoints. (string value)
|
# Region name used to get services endpoints. (string value)
|
||||||
#os_region_name = <None>
|
#os_region_name = <None>
|
||||||
|
|
||||||
|
@ -443,7 +463,7 @@
|
||||||
[conductor]
|
[conductor]
|
||||||
|
|
||||||
#
|
#
|
||||||
# From sahara_main
|
# From sahara.config
|
||||||
#
|
#
|
||||||
|
|
||||||
# Perform sahara-conductor operations locally. (boolean value)
|
# Perform sahara-conductor operations locally. (boolean value)
|
||||||
|
|
|
@ -20,8 +20,6 @@ from oslo.config import cfg
|
||||||
from sahara import exceptions as ex
|
from sahara import exceptions as ex
|
||||||
from sahara.i18n import _
|
from sahara.i18n import _
|
||||||
from sahara.openstack.common import log
|
from sahara.openstack.common import log
|
||||||
from sahara.openstack.common import periodic_task
|
|
||||||
from sahara.openstack.common import policy
|
|
||||||
from sahara.plugins import base as plugins_base
|
from sahara.plugins import base as plugins_base
|
||||||
from sahara.topology import topology_helper
|
from sahara.topology import topology_helper
|
||||||
from sahara.utils.notification import sender
|
from sahara.utils.notification import sender
|
||||||
|
@ -117,29 +115,6 @@ CONF.register_opts(db_opts)
|
||||||
|
|
||||||
|
|
||||||
def list_opts():
|
def list_opts():
|
||||||
return [
|
|
||||||
('DEFAULT',
|
|
||||||
itertools.chain(cli_opts,
|
|
||||||
edp_opts,
|
|
||||||
networking_opts,
|
|
||||||
db_opts,
|
|
||||||
policy.policy_opts,
|
|
||||||
log.common_cli_opts,
|
|
||||||
log.generic_log_opts,
|
|
||||||
log.log_opts,
|
|
||||||
log.logging_cli_opts,
|
|
||||||
periodic_task.periodic_opts,
|
|
||||||
plugins_base.opts,
|
|
||||||
topology_helper.opts,
|
|
||||||
sender.notifier_opts,
|
|
||||||
cinder.opts,
|
|
||||||
keystone.opts,
|
|
||||||
remote.ssh_opts,
|
|
||||||
)),
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
def main_opts():
|
|
||||||
# NOTE (vgridnev): we make these import here to avoid problems
|
# NOTE (vgridnev): we make these import here to avoid problems
|
||||||
# with importing unregistered options in sahara code.
|
# with importing unregistered options in sahara code.
|
||||||
# As example, importing 'node_domain' in
|
# As example, importing 'node_domain' in
|
||||||
|
@ -153,13 +128,23 @@ def main_opts():
|
||||||
from sahara.utils import proxy
|
from sahara.utils import proxy
|
||||||
|
|
||||||
return [
|
return [
|
||||||
('DEFAULT',
|
(None,
|
||||||
itertools.chain(sahara_main.opts,
|
itertools.chain(cli_opts,
|
||||||
|
edp_opts,
|
||||||
|
networking_opts,
|
||||||
|
db_opts,
|
||||||
|
plugins_base.opts,
|
||||||
|
topology_helper.opts,
|
||||||
|
sender.notifier_opts,
|
||||||
|
cinder.opts,
|
||||||
|
keystone.opts,
|
||||||
|
remote.ssh_opts,
|
||||||
|
sahara_main.opts,
|
||||||
job_utils.opts,
|
job_utils.opts,
|
||||||
periodic.periodic_opts,
|
periodic.periodic_opts,
|
||||||
volumes.opts,
|
volumes.opts,
|
||||||
proxy.opts)),
|
proxy.opts)),
|
||||||
('conductor',
|
(api.conductor_group.name,
|
||||||
itertools.chain(api.conductor_opts)),
|
itertools.chain(api.conductor_opts)),
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
@ -57,8 +57,10 @@ sahara.run.mode =
|
||||||
distributed = sahara.service.ops:RemoteOps
|
distributed = sahara.service.ops:RemoteOps
|
||||||
|
|
||||||
oslo.config.opts =
|
oslo.config.opts =
|
||||||
sahara = sahara.config:list_opts
|
sahara.config = sahara.config:list_opts
|
||||||
sahara_main = sahara.config:main_opts
|
log.config = sahara.openstack.common.log:list_opts
|
||||||
|
periodic.config = sahara.openstack.common.periodic_task:list_opts
|
||||||
|
policy.config = sahara.openstack.common.policy:list_opts
|
||||||
|
|
||||||
[build_sphinx]
|
[build_sphinx]
|
||||||
all_files = 1
|
all_files = 1
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
[DEFAULT]
|
[DEFAULT]
|
||||||
namespace = sahara
|
namespace = sahara.config
|
||||||
namespace = oslo.db
|
namespace = oslo.db
|
||||||
namespace = oslo.messaging
|
namespace = oslo.messaging
|
||||||
namespace = oslo.concurrency
|
namespace = oslo.concurrency
|
||||||
namespace = keystonemiddleware.auth_token
|
namespace = keystonemiddleware.auth_token
|
||||||
namespace = sahara_main
|
namespace = log.config
|
||||||
|
namespace = periodic.config
|
||||||
|
namespace = policy.config
|
||||||
|
|
Loading…
Reference in New Issue