openstack/ironic
Code Issues Proposed changes

Make config generator aware of 'default_log_levels' override

Browse Source 
The way it is done in this patch is recommended by the oslo.config
documentation in [0], so that the updated default_log_levels value
is correctly reflected in the generated ironic.conf.sample file.
An oslo.config.opts.defaults entry point is added.

[0] https://docs.openstack.org/developer/oslo.config/generator.html

Change-Id: Ic200e8d0d721a6c94bd17068a6e5000db930eefd
This commit is contained in:
Vladyslav Drok 2017-04-12 16:13:21 +03:00
parent 20815f5d87
commit 6196e58270
4 changed files with 78 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
etc/ironic/ironic.conf.sample
View File

@ -426,6 +426,13 @@
# ignored if log_config_append is set. (boolean value) # ignored if log_config_append is set. (boolean value)
#use_syslog = false #use_syslog = false
# Enable journald for logging. If running in a systemd
# environment you may wish to enable journal support. Doing so
# will use the journal native protocol which includes
# structured metadata in addition to log messages.This option
# is ignored if log_config_append is set. (boolean value)
#use_journal = false
# Syslog facility to receive log lines. This option is ignored # Syslog facility to receive log lines. This option is ignored
# if log_config_append is set. (string value) # if log_config_append is set. (string value)
#syslog_log_facility = LOG_USER #syslog_log_facility = LOG_USER
@ -456,7 +463,7 @@
# List of package logging levels in logger=LEVEL pairs. This # List of package logging levels in logger=LEVEL pairs. This
# option is ignored if log_config_append is set. (list value) # option is ignored if log_config_append is set. (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,requests.packages.urllib3.util.retry=WARN,urllib3.util.retry=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN,taskflow=WARN,keystoneauth=WARN,oslo.cache=INFO,dogpile.core.dogpile=INFO #default_log_levels = amqp=WARNING,amqplib=WARNING,qpid.messaging=INFO,oslo_messaging=INFO,sqlalchemy=WARNING,stevedore=INFO,eventlet.wsgi.server=INFO,iso8601=WARNING,paramiko=WARNING,requests=WARNING,neutronclient=WARNING,glanceclient=WARNING,urllib3.connectionpool=WARNING,keystonemiddleware.auth_token=INFO,keystoneauth.session=INFO
# Enables or disables publication of error events. (boolean # Enables or disables publication of error events. (boolean
# value) # value)
@ -493,7 +500,6 @@
# #
# Size of RPC connection pool. (integer value) # Size of RPC connection pool. (integer value)
# Deprecated group/name - [DEFAULT]/rpc_conn_pool_size
#rpc_conn_pool_size = 30 #rpc_conn_pool_size = 30
# The pool size limit for connections expiration policy # The pool size limit for connections expiration policy
@ -507,31 +513,25 @@
# ZeroMQ bind address. Should be a wildcard (*), an ethernet # ZeroMQ bind address. Should be a wildcard (*), an ethernet
# interface, or IP. The "host" option should point or resolve # interface, or IP. The "host" option should point or resolve
# to this address. (string value) # to this address. (string value)
# Deprecated group/name - [DEFAULT]/rpc_zmq_bind_address
#rpc_zmq_bind_address = * #rpc_zmq_bind_address = *
# MatchMaker driver. (string value) # MatchMaker driver. (string value)
# Allowed values: redis, sentinel, dummy # Allowed values: redis, sentinel, dummy
# Deprecated group/name - [DEFAULT]/rpc_zmq_matchmaker
#rpc_zmq_matchmaker = redis #rpc_zmq_matchmaker = redis
# Number of ZeroMQ contexts, defaults to 1. (integer value) # Number of ZeroMQ contexts, defaults to 1. (integer value)
# Deprecated group/name - [DEFAULT]/rpc_zmq_contexts
#rpc_zmq_contexts = 1 #rpc_zmq_contexts = 1
# Maximum number of ingress messages to locally buffer per # Maximum number of ingress messages to locally buffer per
# topic. Default is unlimited. (integer value) # topic. Default is unlimited. (integer value)
# Deprecated group/name - [DEFAULT]/rpc_zmq_topic_backlog
#rpc_zmq_topic_backlog = <None> #rpc_zmq_topic_backlog = <None>
# Directory for holding IPC sockets. (string value) # Directory for holding IPC sockets. (string value)
# Deprecated group/name - [DEFAULT]/rpc_zmq_ipc_dir
#rpc_zmq_ipc_dir = /var/run/openstack #rpc_zmq_ipc_dir = /var/run/openstack
# Name of this node. Must be a valid hostname, FQDN, or IP # Name of this node. Must be a valid hostname, FQDN, or IP
# address. Must match "host" option, if running Nova. (string # address. Must match "host" option, if running Nova. (string
# value) # value)
# Deprecated group/name - [DEFAULT]/rpc_zmq_host
#rpc_zmq_host = localhost #rpc_zmq_host = localhost
# Number of seconds to wait before all pending messages will # Number of seconds to wait before all pending messages will
@ -547,26 +547,21 @@
# The default number of seconds that poll should wait. Poll # The default number of seconds that poll should wait. Poll
# raises timeout exception when timeout expired. (integer # raises timeout exception when timeout expired. (integer
# value) # value)
# Deprecated group/name - [DEFAULT]/rpc_poll_timeout
#rpc_poll_timeout = 1 #rpc_poll_timeout = 1
# Expiration timeout in seconds of a name service record about # Expiration timeout in seconds of a name service record about
# existing target ( < 0 means no timeout). (integer value) # existing target ( < 0 means no timeout). (integer value)
# Deprecated group/name - [DEFAULT]/zmq_target_expire
#zmq_target_expire = 300 #zmq_target_expire = 300
# Update period in seconds of a name service record about # Update period in seconds of a name service record about
# existing target. (integer value) # existing target. (integer value)
# Deprecated group/name - [DEFAULT]/zmq_target_update
#zmq_target_update = 180 #zmq_target_update = 180
# Use PUB/SUB pattern for fanout methods. PUB/SUB always uses # Use PUB/SUB pattern for fanout methods. PUB/SUB always uses
# proxy. (boolean value) # proxy. (boolean value)
# Deprecated group/name - [DEFAULT]/use_pub_sub
#use_pub_sub = false #use_pub_sub = false
# Use ROUTER remote proxy. (boolean value) # Use ROUTER remote proxy. (boolean value)
# Deprecated group/name - [DEFAULT]/use_router_proxy
#use_router_proxy = false #use_router_proxy = false
# This option makes direct connections dynamic or static. It # This option makes direct connections dynamic or static. It
@ -583,25 +578,21 @@
# Minimal port number for random ports range. (port value) # Minimal port number for random ports range. (port value)
# Minimum value: 0 # Minimum value: 0
# Maximum value: 65535 # Maximum value: 65535
# Deprecated group/name - [DEFAULT]/rpc_zmq_min_port
#rpc_zmq_min_port = 49153 #rpc_zmq_min_port = 49153
# Maximal port number for random ports range. (integer value) # Maximal port number for random ports range. (integer value)
# Minimum value: 1 # Minimum value: 1
# Maximum value: 65536 # Maximum value: 65536
# Deprecated group/name - [DEFAULT]/rpc_zmq_max_port
#rpc_zmq_max_port = 65536 #rpc_zmq_max_port = 65536
# Number of retries to find free port number before fail with # Number of retries to find free port number before fail with
# ZMQBindError. (integer value) # ZMQBindError. (integer value)
# Deprecated group/name - [DEFAULT]/rpc_zmq_bind_port_retries
#rpc_zmq_bind_port_retries = 100 #rpc_zmq_bind_port_retries = 100
# Default serialization mechanism for # Default serialization mechanism for
# serializing/deserializing outgoing/incoming messages (string # serializing/deserializing outgoing/incoming messages (string
# value) # value)
# Allowed values: json, msgpack # Allowed values: json, msgpack
# Deprecated group/name - [DEFAULT]/rpc_zmq_serialization
#rpc_zmq_serialization = json #rpc_zmq_serialization = json
# This option configures round-robin mode in zmq socket. True # This option configures round-robin mode in zmq socket. True
@ -677,7 +668,8 @@
# taken from the matchmaker. (list value) # taken from the matchmaker. (list value)
#subscribe_on = #subscribe_on =
# Size of executor thread pool. (integer value) # Size of executor thread pool when executor is threading or
# eventlet. (integer value)
# Deprecated group/name - [DEFAULT]/rpc_thread_pool_size # Deprecated group/name - [DEFAULT]/rpc_thread_pool_size
#executor_thread_pool_size = 64 #executor_thread_pool_size = 64
@ -945,11 +937,11 @@
#project_domain_name = <None> #project_domain_name = <None>
# Project ID to scope to (string value) # Project ID to scope to (string value)
# Deprecated group/name - [cinder]/tenant-id # Deprecated group/name - [cinder]/tenant_id
#project_id = <None> #project_id = <None>
# Project name to scope to (string value) # Project name to scope to (string value)
# Deprecated group/name - [cinder]/tenant-name # Deprecated group/name - [cinder]/tenant_name
#project_name = <None> #project_name = <None>
# Client retries in the case of a failed request connection. # Client retries in the case of a failed request connection.
@ -972,10 +964,6 @@
# with either http:// or https://. (string value) # with either http:// or https://. (string value)
#url = <None> #url = <None>
# Timeout value for connecting to cinder in seconds. (integer
# value)
#url_timeout = 30
# User's domain id (string value) # User's domain id (string value)
#user_domain_id = <None> #user_domain_id = <None>
@ -986,7 +974,7 @@
#user_id = <None> #user_id = <None>
# Username (string value) # Username (string value)
# Deprecated group/name - [cinder]/user-name # Deprecated group/name - [cinder]/user_name
#username = <None> #username = <None>
@ -1245,7 +1233,6 @@
# #
# If True, SQLite uses synchronous mode. (boolean value) # If True, SQLite uses synchronous mode. (boolean value)
# Deprecated group/name - [DEFAULT]/sqlite_synchronous
#sqlite_synchronous = true #sqlite_synchronous = true
# The back end to use for the database. (string value) # The back end to use for the database. (string value)
@ -1576,11 +1563,11 @@
#project_domain_name = <None> #project_domain_name = <None>
# Project ID to scope to (string value) # Project ID to scope to (string value)
# Deprecated group/name - [glance]/tenant-id # Deprecated group/name - [glance]/tenant_id
#project_id = <None> #project_id = <None>
# Project name to scope to (string value) # Project name to scope to (string value)
# Deprecated group/name - [glance]/tenant-name # Deprecated group/name - [glance]/tenant_name
#project_name = <None> #project_name = <None>
# The account that Glance uses to communicate with Swift. The # The account that Glance uses to communicate with Swift. The
@ -1683,7 +1670,7 @@
#user_id = <None> #user_id = <None>
# Username (string value) # Username (string value)
# Deprecated group/name - [glance]/user-name # Deprecated group/name - [glance]/user_name
#username = <None> #username = <None>
@ -1816,11 +1803,11 @@
#project_domain_name = <None> #project_domain_name = <None>
# Project ID to scope to (string value) # Project ID to scope to (string value)
# Deprecated group/name - [inspector]/tenant-id # Deprecated group/name - [inspector]/tenant_id
#project_id = <None> #project_id = <None>
# Project name to scope to (string value) # Project name to scope to (string value)
# Deprecated group/name - [inspector]/tenant-name # Deprecated group/name - [inspector]/tenant_name
#project_name = <None> #project_name = <None>
# ironic-inspector HTTP endpoint. If this is not set, the # ironic-inspector HTTP endpoint. If this is not set, the
@ -1853,7 +1840,7 @@
#user_id = <None> #user_id = <None>
# Username (string value) # Username (string value)
# Deprecated group/name - [inspector]/user-name # Deprecated group/name - [inspector]/user_name
#username = <None> #username = <None>
@ -2154,6 +2141,22 @@
# Reason: PKI token format is no longer supported. # Reason: PKI token format is no longer supported.
#hash_algorithms = md5 #hash_algorithms = md5
# A choice of roles that must be present in a service token.
# Service tokens are allowed to request that an expired token
# can be used and so this check should tightly control that
# only actual services should be sending this token. Roles
# here are applied as an ANY check so any role in this list
# must be present. For backwards compatibility reasons this
# currently only affects the allow_expired check. (list value)
#service_token_roles = service
# For backwards compatibility reasons we must let valid
# service tokens pass that don't pass the service_token_roles
# check as valid. Setting this true will become the default in
# a future release and should be enabled if possible. (boolean
# value)
#service_token_roles_required = false
# Authentication type to load (string value) # Authentication type to load (string value)
# Deprecated group/name - [keystone_authtoken]/auth_plugin # Deprecated group/name - [keystone_authtoken]/auth_plugin
#auth_type = <None> #auth_type = <None>
@ -2382,11 +2385,11 @@
#project_domain_name = <None> #project_domain_name = <None>
# Project ID to scope to (string value) # Project ID to scope to (string value)
# Deprecated group/name - [neutron]/tenant-id # Deprecated group/name - [neutron]/tenant_id
#project_id = <None> #project_id = <None>
# Project name to scope to (string value) # Project name to scope to (string value)
# Deprecated group/name - [neutron]/tenant-name # Deprecated group/name - [neutron]/tenant_name
#project_name = <None> #project_name = <None>
# Neutron network UUID or name for the ramdisk to be booted # Neutron network UUID or name for the ramdisk to be booted
@ -2439,7 +2442,7 @@
#user_id = <None> #user_id = <None>
# Username (string value) # Username (string value)
# Deprecated group/name - [neutron]/user-name # Deprecated group/name - [neutron]/user_name
#username = <None> #username = <None>
@ -2488,7 +2491,6 @@
# #
# Enables or disables inter-process locks. (boolean value) # Enables or disables inter-process locks. (boolean value)
# Deprecated group/name - [DEFAULT]/disable_process_locking
#disable_process_locking = false #disable_process_locking = false
# Directory to use for lock files. For security, the # Directory to use for lock files. For security, the
@ -2496,7 +2498,6 @@
# running the processes that need locking. Defaults to # running the processes that need locking. Defaults to
# environment variable OSLO_LOCK_PATH. If external locks are # environment variable OSLO_LOCK_PATH. If external locks are
# used, a lock path must be set. (string value) # used, a lock path must be set. (string value)
# Deprecated group/name - [DEFAULT]/lock_path
#lock_path = <None> #lock_path = <None>
@ -2508,41 +2509,38 @@
# Name for the AMQP container. must be globally unique. # Name for the AMQP container. must be globally unique.
# Defaults to a generated UUID (string value) # Defaults to a generated UUID (string value)
# Deprecated group/name - [amqp1]/container_name
#container_name = <None> #container_name = <None>
# Timeout for inactive connections (in seconds) (integer # Timeout for inactive connections (in seconds) (integer
# value) # value)
# Deprecated group/name - [amqp1]/idle_timeout
#idle_timeout = 0 #idle_timeout = 0
# Debug: dump AMQP frames to stdout (boolean value) # Debug: dump AMQP frames to stdout (boolean value)
# Deprecated group/name - [amqp1]/trace
#trace = false #trace = false
# Attempt to connect via SSL. If no other ssl-related
# parameters are given, it will use the system's CA-bundle to
# verify the server's certificate. (boolean value)
#ssl = false
# CA certificate PEM file used to verify the server's # CA certificate PEM file used to verify the server's
# certificate (string value) # certificate (string value)
# Deprecated group/name - [amqp1]/ssl_ca_file
#ssl_ca_file = #ssl_ca_file =
# Self-identifying certificate PEM file for client # Self-identifying certificate PEM file for client
# authentication (string value) # authentication (string value)
# Deprecated group/name - [amqp1]/ssl_cert_file
#ssl_cert_file = #ssl_cert_file =
# Private key PEM file used to sign ssl_cert_file certificate # Private key PEM file used to sign ssl_cert_file certificate
# (optional) (string value) # (optional) (string value)
# Deprecated group/name - [amqp1]/ssl_key_file
#ssl_key_file = #ssl_key_file =
# Password for decrypting ssl_key_file (if encrypted) (string # Password for decrypting ssl_key_file (if encrypted) (string
# value) # value)
# Deprecated group/name - [amqp1]/ssl_key_password
#ssl_key_password = <None> #ssl_key_password = <None>
# DEPRECATED: Accept clients using either SSL or plain TCP # DEPRECATED: Accept clients using either SSL or plain TCP
# (boolean value) # (boolean value)
# Deprecated group/name - [amqp1]/allow_insecure_clients
# This option is deprecated for removal. # This option is deprecated for removal.
# Its value may be silently ignored in the future. # Its value may be silently ignored in the future.
# Reason: Not applicable - not a SSL server # Reason: Not applicable - not a SSL server
@ -2550,25 +2548,20 @@
# Space separated list of acceptable SASL mechanisms (string # Space separated list of acceptable SASL mechanisms (string
# value) # value)
# Deprecated group/name - [amqp1]/sasl_mechanisms
#sasl_mechanisms = #sasl_mechanisms =
# Path to directory that contains the SASL configuration # Path to directory that contains the SASL configuration
# (string value) # (string value)
# Deprecated group/name - [amqp1]/sasl_config_dir
#sasl_config_dir = #sasl_config_dir =
# Name of configuration file (without .conf suffix) (string # Name of configuration file (without .conf suffix) (string
# value) # value)
# Deprecated group/name - [amqp1]/sasl_config_name
#sasl_config_name = #sasl_config_name =
# User name for message broker authentication (string value) # User name for message broker authentication (string value)
# Deprecated group/name - [amqp1]/username
#username = #username =
# Password for message broker authentication (string value) # Password for message broker authentication (string value)
# Deprecated group/name - [amqp1]/password
#password = #password =
# Seconds to pause before attempting to re-connect. (integer # Seconds to pause before attempting to re-connect. (integer
@ -2629,17 +2622,14 @@
# address prefix used when sending to a specific server # address prefix used when sending to a specific server
# (string value) # (string value)
# Deprecated group/name - [amqp1]/server_request_prefix
#server_request_prefix = exclusive #server_request_prefix = exclusive
# address prefix used when broadcasting to all servers (string # address prefix used when broadcasting to all servers (string
# value) # value)
# Deprecated group/name - [amqp1]/broadcast_prefix
#broadcast_prefix = broadcast #broadcast_prefix = broadcast
# address prefix when sending to any server in group (string # address prefix when sending to any server in group (string
# value) # value)
# Deprecated group/name - [amqp1]/group_request_prefix
#group_request_prefix = unicast #group_request_prefix = unicast
# Address prefix for all generated RPC addresses (string # Address prefix for all generated RPC addresses (string
@ -2796,7 +2786,6 @@
#amqp_durable_queues = false #amqp_durable_queues = false
# Auto-delete queues in AMQP. (boolean value) # Auto-delete queues in AMQP. (boolean value)
# Deprecated group/name - [DEFAULT]/amqp_auto_delete
#amqp_auto_delete = false #amqp_auto_delete = false
# Enable SSL (boolean value) # Enable SSL (boolean value)
@ -2823,7 +2812,6 @@
# How long to wait before reconnecting in response to an AMQP # How long to wait before reconnecting in response to an AMQP
# consumer cancel notification. (floating point value) # consumer cancel notification. (floating point value)
# Deprecated group/name - [DEFAULT]/kombu_reconnect_delay
#kombu_reconnect_delay = 1.0 #kombu_reconnect_delay = 1.0
# EXPERIMENTAL: Possible values are: gzip, bz2. If not set # EXPERIMENTAL: Possible values are: gzip, bz2. If not set
@ -2846,7 +2834,6 @@
# DEPRECATED: The RabbitMQ broker address where a single node # DEPRECATED: The RabbitMQ broker address where a single node
# is used. (string value) # is used. (string value)
# Deprecated group/name - [DEFAULT]/rabbit_host
# This option is deprecated for removal. # This option is deprecated for removal.
# Its value may be silently ignored in the future. # Its value may be silently ignored in the future.
# Reason: Replaced by [DEFAULT]/transport_url # Reason: Replaced by [DEFAULT]/transport_url
@ -2856,7 +2843,6 @@
# used. (port value) # used. (port value)
# Minimum value: 0 # Minimum value: 0
# Maximum value: 65535 # Maximum value: 65535
# Deprecated group/name - [DEFAULT]/rabbit_port
# This option is deprecated for removal. # This option is deprecated for removal.
# Its value may be silently ignored in the future. # Its value may be silently ignored in the future.
# Reason: Replaced by [DEFAULT]/transport_url # Reason: Replaced by [DEFAULT]/transport_url
@ -2864,21 +2850,18 @@
# DEPRECATED: RabbitMQ HA cluster host:port pairs. (list # DEPRECATED: RabbitMQ HA cluster host:port pairs. (list
# value) # value)
# Deprecated group/name - [DEFAULT]/rabbit_hosts
# This option is deprecated for removal. # This option is deprecated for removal.
# Its value may be silently ignored in the future. # Its value may be silently ignored in the future.
# Reason: Replaced by [DEFAULT]/transport_url # Reason: Replaced by [DEFAULT]/transport_url
#rabbit_hosts = $rabbit_host:$rabbit_port #rabbit_hosts = $rabbit_host:$rabbit_port
# DEPRECATED: The RabbitMQ userid. (string value) # DEPRECATED: The RabbitMQ userid. (string value)
# Deprecated group/name - [DEFAULT]/rabbit_userid
# This option is deprecated for removal. # This option is deprecated for removal.
# Its value may be silently ignored in the future. # Its value may be silently ignored in the future.
# Reason: Replaced by [DEFAULT]/transport_url # Reason: Replaced by [DEFAULT]/transport_url
#rabbit_userid = guest #rabbit_userid = guest
# DEPRECATED: The RabbitMQ password. (string value) # DEPRECATED: The RabbitMQ password. (string value)
# Deprecated group/name - [DEFAULT]/rabbit_password
# This option is deprecated for removal. # This option is deprecated for removal.
# Its value may be silently ignored in the future. # Its value may be silently ignored in the future.
# Reason: Replaced by [DEFAULT]/transport_url # Reason: Replaced by [DEFAULT]/transport_url
@ -2886,11 +2869,9 @@
# The RabbitMQ login method. (string value) # The RabbitMQ login method. (string value)
# Allowed values: PLAIN, AMQPLAIN, RABBIT-CR-DEMO # Allowed values: PLAIN, AMQPLAIN, RABBIT-CR-DEMO
# Deprecated group/name - [DEFAULT]/rabbit_login_method
#rabbit_login_method = AMQPLAIN #rabbit_login_method = AMQPLAIN
# DEPRECATED: The RabbitMQ virtual host. (string value) # DEPRECATED: The RabbitMQ virtual host. (string value)
# Deprecated group/name - [DEFAULT]/rabbit_virtual_host
# This option is deprecated for removal. # This option is deprecated for removal.
# Its value may be silently ignored in the future. # Its value may be silently ignored in the future.
# Reason: Replaced by [DEFAULT]/transport_url # Reason: Replaced by [DEFAULT]/transport_url
@ -2902,7 +2883,6 @@
# How long to backoff for between retries when connecting to # How long to backoff for between retries when connecting to
# RabbitMQ. (integer value) # RabbitMQ. (integer value)
# Deprecated group/name - [DEFAULT]/rabbit_retry_backoff
#rabbit_retry_backoff = 2 #rabbit_retry_backoff = 2
# Maximum interval of RabbitMQ connection retries. Default is # Maximum interval of RabbitMQ connection retries. Default is
@ -2911,7 +2891,6 @@
# DEPRECATED: Maximum number of RabbitMQ connection retries. # DEPRECATED: Maximum number of RabbitMQ connection retries.
# Default is 0 (infinite retry count). (integer value) # Default is 0 (infinite retry count). (integer value)
# Deprecated group/name - [DEFAULT]/rabbit_max_retries
# This option is deprecated for removal. # This option is deprecated for removal.
# Its value may be silently ignored in the future. # Its value may be silently ignored in the future.
#rabbit_max_retries = 0 #rabbit_max_retries = 0
@ -2924,7 +2903,6 @@
# generated names) are mirrored across all nodes, run: # generated names) are mirrored across all nodes, run:
# "rabbitmqctl set_policy HA '^(?!amq\.).*' '{"ha-mode": # "rabbitmqctl set_policy HA '^(?!amq\.).*' '{"ha-mode":
# "all"}' " (boolean value) # "all"}' " (boolean value)
# Deprecated group/name - [DEFAULT]/rabbit_ha_queues
#rabbit_ha_queues = false #rabbit_ha_queues = false
# Positive integer representing duration in seconds for queue # Positive integer representing duration in seconds for queue
@ -2949,7 +2927,6 @@
# Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake # Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake
# (boolean value) # (boolean value)
# Deprecated group/name - [DEFAULT]/fake_rabbit
#fake_rabbit = false #fake_rabbit = false
# Maximum number of channels to allow (integer value) # Maximum number of channels to allow (integer value)
@ -3075,31 +3052,25 @@
# ZeroMQ bind address. Should be a wildcard (*), an ethernet # ZeroMQ bind address. Should be a wildcard (*), an ethernet
# interface, or IP. The "host" option should point or resolve # interface, or IP. The "host" option should point or resolve
# to this address. (string value) # to this address. (string value)
# Deprecated group/name - [DEFAULT]/rpc_zmq_bind_address
#rpc_zmq_bind_address = * #rpc_zmq_bind_address = *
# MatchMaker driver. (string value) # MatchMaker driver. (string value)
# Allowed values: redis, sentinel, dummy # Allowed values: redis, sentinel, dummy
# Deprecated group/name - [DEFAULT]/rpc_zmq_matchmaker
#rpc_zmq_matchmaker = redis #rpc_zmq_matchmaker = redis
# Number of ZeroMQ contexts, defaults to 1. (integer value) # Number of ZeroMQ contexts, defaults to 1. (integer value)
# Deprecated group/name - [DEFAULT]/rpc_zmq_contexts
#rpc_zmq_contexts = 1 #rpc_zmq_contexts = 1
# Maximum number of ingress messages to locally buffer per # Maximum number of ingress messages to locally buffer per
# topic. Default is unlimited. (integer value) # topic. Default is unlimited. (integer value)
# Deprecated group/name - [DEFAULT]/rpc_zmq_topic_backlog
#rpc_zmq_topic_backlog = <None> #rpc_zmq_topic_backlog = <None>
# Directory for holding IPC sockets. (string value) # Directory for holding IPC sockets. (string value)
# Deprecated group/name - [DEFAULT]/rpc_zmq_ipc_dir
#rpc_zmq_ipc_dir = /var/run/openstack #rpc_zmq_ipc_dir = /var/run/openstack
# Name of this node. Must be a valid hostname, FQDN, or IP # Name of this node. Must be a valid hostname, FQDN, or IP
# address. Must match "host" option, if running Nova. (string # address. Must match "host" option, if running Nova. (string
# value) # value)
# Deprecated group/name - [DEFAULT]/rpc_zmq_host
#rpc_zmq_host = localhost #rpc_zmq_host = localhost
# Number of seconds to wait before all pending messages will # Number of seconds to wait before all pending messages will
@ -3115,26 +3086,21 @@
# The default number of seconds that poll should wait. Poll # The default number of seconds that poll should wait. Poll
# raises timeout exception when timeout expired. (integer # raises timeout exception when timeout expired. (integer
# value) # value)
# Deprecated group/name - [DEFAULT]/rpc_poll_timeout
#rpc_poll_timeout = 1 #rpc_poll_timeout = 1
# Expiration timeout in seconds of a name service record about # Expiration timeout in seconds of a name service record about
# existing target ( < 0 means no timeout). (integer value) # existing target ( < 0 means no timeout). (integer value)
# Deprecated group/name - [DEFAULT]/zmq_target_expire
#zmq_target_expire = 300 #zmq_target_expire = 300
# Update period in seconds of a name service record about # Update period in seconds of a name service record about
# existing target. (integer value) # existing target. (integer value)
# Deprecated group/name - [DEFAULT]/zmq_target_update
#zmq_target_update = 180 #zmq_target_update = 180
# Use PUB/SUB pattern for fanout methods. PUB/SUB always uses # Use PUB/SUB pattern for fanout methods. PUB/SUB always uses
# proxy. (boolean value) # proxy. (boolean value)
# Deprecated group/name - [DEFAULT]/use_pub_sub
#use_pub_sub = false #use_pub_sub = false
# Use ROUTER remote proxy. (boolean value) # Use ROUTER remote proxy. (boolean value)
# Deprecated group/name - [DEFAULT]/use_router_proxy
#use_router_proxy = false #use_router_proxy = false
# This option makes direct connections dynamic or static. It # This option makes direct connections dynamic or static. It
@ -3151,25 +3117,21 @@
# Minimal port number for random ports range. (port value) # Minimal port number for random ports range. (port value)
# Minimum value: 0 # Minimum value: 0
# Maximum value: 65535 # Maximum value: 65535
# Deprecated group/name - [DEFAULT]/rpc_zmq_min_port
#rpc_zmq_min_port = 49153 #rpc_zmq_min_port = 49153
# Maximal port number for random ports range. (integer value) # Maximal port number for random ports range. (integer value)
# Minimum value: 1 # Minimum value: 1
# Maximum value: 65536 # Maximum value: 65536
# Deprecated group/name - [DEFAULT]/rpc_zmq_max_port
#rpc_zmq_max_port = 65536 #rpc_zmq_max_port = 65536
# Number of retries to find free port number before fail with # Number of retries to find free port number before fail with
# ZMQBindError. (integer value) # ZMQBindError. (integer value)
# Deprecated group/name - [DEFAULT]/rpc_zmq_bind_port_retries
#rpc_zmq_bind_port_retries = 100 #rpc_zmq_bind_port_retries = 100
# Default serialization mechanism for # Default serialization mechanism for
# serializing/deserializing outgoing/incoming messages (string # serializing/deserializing outgoing/incoming messages (string
# value) # value)
# Allowed values: json, msgpack # Allowed values: json, msgpack
# Deprecated group/name - [DEFAULT]/rpc_zmq_serialization
#rpc_zmq_serialization = json #rpc_zmq_serialization = json
# This option configures round-robin mode in zmq socket. True # This option configures round-robin mode in zmq socket. True
@ -3253,12 +3215,10 @@
# #
# The file that defines policies. (string value) # The file that defines policies. (string value)
# Deprecated group/name - [DEFAULT]/policy_file
#policy_file = policy.json #policy_file = policy.json
# Default rule. Enforced when a requested rule is not found. # Default rule. Enforced when a requested rule is not found.
# (string value) # (string value)
# Deprecated group/name - [DEFAULT]/policy_default_rule
#policy_default_rule = default #policy_default_rule = default
# Directories where policy configuration files are stored. # Directories where policy configuration files are stored.
@ -3267,7 +3227,6 @@
# file defined by policy_file must exist for these directories # file defined by policy_file must exist for these directories
# to be searched. Missing or empty directories are ignored. # to be searched. Missing or empty directories are ignored.
# (multi valued) # (multi valued)
# Deprecated group/name - [DEFAULT]/policy_dirs
#policy_dirs = policy.d #policy_dirs = policy.d
@ -3414,11 +3373,11 @@
#project_domain_name = <None> #project_domain_name = <None>
# Project ID to scope to (string value) # Project ID to scope to (string value)
# Deprecated group/name - [service_catalog]/tenant-id # Deprecated group/name - [service_catalog]/tenant_id
#project_id = <None> #project_id = <None>
# Project name to scope to (string value) # Project name to scope to (string value)
# Deprecated group/name - [service_catalog]/tenant-name # Deprecated group/name - [service_catalog]/tenant_name
#project_name = <None> #project_name = <None>
# Tenant ID (string value) # Tenant ID (string value)
@ -3443,7 +3402,7 @@
#user_id = <None> #user_id = <None>
# Username (string value) # Username (string value)
# Deprecated group/name - [service_catalog]/user-name # Deprecated group/name - [service_catalog]/user_name
#username = <None> #username = <None>
@ -3565,11 +3524,11 @@
#project_domain_name = <None> #project_domain_name = <None>
# Project ID to scope to (string value) # Project ID to scope to (string value)
# Deprecated group/name - [swift]/tenant-id # Deprecated group/name - [swift]/tenant_id
#project_id = <None> #project_id = <None>
# Project name to scope to (string value) # Project name to scope to (string value)
# Deprecated group/name - [swift]/tenant-name # Deprecated group/name - [swift]/tenant_name
#project_name = <None> #project_name = <None>
# Maximum number of times to retry a Swift request, before # Maximum number of times to retry a Swift request, before
@ -3598,5 +3557,5 @@
#user_id = <None> #user_id = <None>
# Username (string value) # Username (string value)
# Deprecated group/name - [swift]/user-name # Deprecated group/name - [swift]/user_name
#username = <None> #username = <None>

19
ironic/common/service.py
View File

@ -19,29 +19,14 @@ from oslo_service import service
from ironic.common import config from ironic.common import config
from ironic.conf import CONF from ironic.conf import CONF
from ironic.conf import opts
from ironic import objects from ironic import objects
def prepare_service(argv=None): def prepare_service(argv=None):
argv = [] if argv is None else argv argv = [] if argv is None else argv
log.register_options(CONF) log.register_options(CONF)
log.set_defaults(default_log_levels=[ opts.update_opt_defaults()
'amqp=WARNING',
'amqplib=WARNING',
'qpid.messaging=INFO',
'oslo_messaging=INFO',
'sqlalchemy=WARNING',
'stevedore=INFO',
'eventlet.wsgi.server=INFO',
'iso8601=WARNING',
'paramiko=WARNING',
'requests=WARNING',
'neutronclient=WARNING',
'glanceclient=WARNING',
'urllib3.connectionpool=WARNING',
'keystonemiddleware.auth_token=INFO',
'keystoneauth.session=INFO',
])
config.parse_args(argv) config.parse_args(argv)
# NOTE(vdrok): We need to setup logging after argv was parsed, otherwise # NOTE(vdrok): We need to setup logging after argv was parsed, otherwise
# it does not properly parse the options from config file and uses defaults # it does not properly parse the options from config file and uses defaults

24
ironic/conf/opts.py
View File

@ -12,6 +12,8 @@
import itertools import itertools
from oslo_log import log
import ironic.conf import ironic.conf
_default_opt_lists = [ _default_opt_lists = [
@ -78,3 +80,25 @@ def list_opts():
:returns: a list of (group, options) tuples :returns: a list of (group, options) tuples
""" """
return _opts return _opts
def update_opt_defaults():
log.set_defaults(
default_log_levels=[
'amqp=WARNING',
'amqplib=WARNING',
'qpid.messaging=INFO',
'oslo_messaging=INFO',
'sqlalchemy=WARNING',
'stevedore=INFO',
'eventlet.wsgi.server=INFO',
'iso8601=WARNING',
'paramiko=WARNING',
'requests=WARNING',
'neutronclient=WARNING',
'glanceclient=WARNING',
'urllib3.connectionpool=WARNING',
'keystonemiddleware.auth_token=INFO',
'keystoneauth.session=INFO',
]
)

3
setup.cfg
View File

@ -25,6 +25,9 @@ packages =
oslo.config.opts = oslo.config.opts =
ironic = ironic.conf.opts:list_opts ironic = ironic.conf.opts:list_opts
oslo.config.opts.defaults =
ironic = ironic.conf.opts:update_opt_defaults
oslo.policy.enforcer = oslo.policy.enforcer =
ironic = ironic.common.policy:get_oslo_policy_enforcer ironic = ironic.common.policy:get_oslo_policy_enforcer