diff --git a/doc/common/tables/sahara-amqp.xml b/doc/common/tables/sahara-amqp.xml index 49aa59eb7d..d6853a99e3 100644 --- a/doc/common/tables/sahara-amqp.xml +++ b/doc/common/tables/sahara-amqp.xml @@ -23,7 +23,7 @@ = [] - (MultiStrOpt) Driver or drivers to handle sending notifications. + (MultiStrOpt) The Drivers(s) to handle sending notifications. Possible values are messaging, messagingv2, routing, log, test, noop = INFO diff --git a/doc/common/tables/sahara-api.xml b/doc/common/tables/sahara-api.xml new file mode 100644 index 0000000000..477f2f97c2 --- /dev/null +++ b/doc/common/tables/sahara-api.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of API configuration options
Configuration option = Default valueDescription
[oslo_middleware]
= 114688(IntOpt) The maximum body size for each request, in bytes.
= X-Forwarded-Proto(StrOpt) The HTTP Header that will be used to determine what the original request protocol scheme was, even if it was hidden by an SSL termination proxy.
[retries]
= 5(IntOpt) Number of times to retry the request to client before failing
= 10(IntOpt) Time between the retries to client (in seconds).
+ diff --git a/doc/common/tables/sahara-auth_token.xml b/doc/common/tables/sahara-auth_token.xml index 6506419eea..16b4e6c30c 100644 --- a/doc/common/tables/sahara-auth_token.xml +++ b/doc/common/tables/sahara-auth_token.xml @@ -119,7 +119,7 @@ = 10 - (IntOpt) (Optional) Number of seconds that an operation will wait to get a memcache client connection from the pool. + (IntOpt) (Optional) Number of seconds that an operation will wait to get a memcached client connection from the pool. = 300 @@ -131,7 +131,7 @@ = 3 - (IntOpt) (Optional) Socket timeout in seconds for communicating with a memcache server. + (IntOpt) (Optional) Socket timeout in seconds for communicating with a memcached server. = 60 @@ -147,7 +147,7 @@ = False - (BoolOpt) (Optional) Use the advanced (eventlet safe) memcache client pool. The advanced pool will only work under python 2.x. + (BoolOpt) (Optional) Use the advanced (eventlet safe) memcached client pool. The advanced pool will only work under python 2.x. = 10 diff --git a/doc/common/tables/sahara-ca.xml b/doc/common/tables/sahara-ca.xml deleted file mode 100644 index 1879381100..0000000000 --- a/doc/common/tables/sahara-ca.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Description of CA and SSL configuration options
Configuration option = Default valueDescription
[ssl]
= None(StrOpt) CA certificate file to use to verify connecting clients.
= None(StrOpt) Certificate file to use when starting the server securely.
= None(StrOpt) Private key file to use when starting the server securely.
- diff --git a/doc/common/tables/sahara-common.xml b/doc/common/tables/sahara-common.xml index 51a2db3e83..a67e0288bb 100644 --- a/doc/common/tables/sahara-common.xml +++ b/doc/common/tables/sahara-common.xml @@ -62,7 +62,7 @@ (IntOpt) Maximum number of remote operations that will be running at the same time. Note that each remote operation requires its own process to run. - = direct + = heat (StrOpt) An engine which will be used to provision infrastructure for Hadoop cluster. @@ -125,10 +125,6 @@ = sudo sahara-rootwrap /etc/sahara/rootwrap.conf (StrOpt) Rootwrap command to leverage. Use in conjunction with use_rootwrap=True - - = True - (BoolOpt) Some periodic tasks can be run in a separate process. Should we run them here? - = etc/sahara/swift.topology (StrOpt) File with Swift topology.It should contain mapping between Swift nodes and racks. diff --git a/doc/common/tables/sahara-cors.xml b/doc/common/tables/sahara-cors.xml new file mode 100644 index 0000000000..57926ad3b2 --- /dev/null +++ b/doc/common/tables/sahara-cors.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of CORS configuration options
Configuration option = Default valueDescription
[cors]
= True(BoolOpt) Indicate that the actual request can include user credentials
= Content-Type, Cache-Control, Content-Language, Expires, Last-Modified, Pragma(ListOpt) Indicate which header field names may be used during the actual request.
= GET, POST, PUT, DELETE, OPTIONS(ListOpt) Indicate which methods can be used during the actual request.
= None(StrOpt) Indicate whether this resource may be shared with the domain received in the requests "origin" header.
= Content-Type, Cache-Control, Content-Language, Expires, Last-Modified, Pragma(ListOpt) Indicate which headers are safe to expose to the API. Defaults to HTTP Simple Headers.
= 3600(IntOpt) Maximum cache age of CORS preflight requests.
[cors.subdomain]
= True(BoolOpt) Indicate that the actual request can include user credentials
= Content-Type, Cache-Control, Content-Language, Expires, Last-Modified, Pragma(ListOpt) Indicate which header field names may be used during the actual request.
= GET, POST, PUT, DELETE, OPTIONS(ListOpt) Indicate which methods can be used during the actual request.
= None(StrOpt) Indicate whether this resource may be shared with the domain received in the requests "origin" header.
= Content-Type, Cache-Control, Content-Language, Expires, Last-Modified, Pragma(ListOpt) Indicate which headers are safe to expose to the API. Defaults to HTTP Simple Headers.
= 3600(IntOpt) Maximum cache age of CORS preflight requests.
+ diff --git a/doc/common/tables/sahara-logging.xml b/doc/common/tables/sahara-logging.xml index cc61c3e0d5..601804b3cf 100644 --- a/doc/common/tables/sahara-logging.xml +++ b/doc/common/tables/sahara-logging.xml @@ -22,7 +22,7 @@ (BoolOpt) Print debugging output (set logging level to DEBUG instead of default WARNING level). - = 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, oslo_messaging=INFO + = 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, oslo_messaging=INFO, neutronclient=INFO (ListOpt) List of logger=LEVEL pairs. @@ -57,26 +57,6 @@ = None (StrOpt) 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. - - = None - (StrOpt) 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. - - - = %Y-%m-%d %H:%M:%S - (StrOpt) Format string for %%(asctime)s in log records. Default: %(default)s . - - - = None - (StrOpt) (Optional) The base directory used for relative --log-file paths. - - - = None - (StrOpt) (Optional) Name of log file to output to. If no default is set, logging will go to stdout. - - - = None - (StrOpt) 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. - = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s (StrOpt) Format string to use for log messages with context. @@ -90,7 +70,7 @@ (StrOpt) Format string to use for log messages without context. - = %(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s + = %(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s (StrOpt) Prefix each line of exception output with this format. @@ -101,29 +81,17 @@ = LOG_USER (StrOpt) Syslog facility to receive log lines. - - = LOG_USER - (StrOpt) Syslog facility to receive log lines. - - - = False - (BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED during I, and will change in J to honor RFC5424. - - - = False - (BoolOpt) (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. - = True (BoolOpt) Log output to standard error. = False - (BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED during I, and will change in J to honor RFC5424. + (BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED and will be changed later to honor RFC5424. - = False - (BoolOpt) (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. + = True + (BoolOpt) (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 K, and will be removed in M, along with this option. = False diff --git a/doc/common/tables/sahara-oslo_middleware.xml b/doc/common/tables/sahara-oslo_middleware.xml deleted file mode 100644 index 8c78abe557..0000000000 --- a/doc/common/tables/sahara-oslo_middleware.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - -
Description of oslo_middleware configuration options
Configuration option = Default valueDescription
[oslo_middleware]
= 114688(IntOpt) The maximum body size for each request, in bytes.
- diff --git a/doc/common/tables/sahara-qpid.xml b/doc/common/tables/sahara-qpid.xml index 14801fc5b1..e085bf0ab8 100644 --- a/doc/common/tables/sahara-qpid.xml +++ b/doc/common/tables/sahara-qpid.xml @@ -70,8 +70,8 @@ (StrOpt) Username for Qpid connection. - = 30 - (IntOpt) Size of RPC connection pool. + = False + (BoolOpt) Send a single AMQP reply to call message. The current behaviour since oslo-incubator is to send two AMQP replies - first one with the payload, a second one to ensure the other have finish to send the payload. We are going to remove it in the N release, but we must keep backward compatible at the same time. This option provides such compatibility - it defaults to False in Liberty and can be turned on for early adopters with a new installations or for testing. Please note, that this option will be removed in M release. diff --git a/doc/common/tables/sahara-rabbitmq.xml b/doc/common/tables/sahara-rabbitmq.xml index bb4fee1145..6060d73178 100644 --- a/doc/common/tables/sahara-rabbitmq.xml +++ b/doc/common/tables/sahara-rabbitmq.xml @@ -34,13 +34,17 @@ (IntOpt) How often times during the heartbeat_timeout_threshold we check the heartbeat. - = 0 - (IntOpt) Number of seconds after which the Rabbit broker is considered down if heartbeat's keep-alive fails (0 disables the heartbeat, >0 enables it. Enabling heartbeats requires kombu>=3.0.7 and amqp>=1.4.0). EXPERIMENTAL + = 60 + (IntOpt) Number of seconds after which the Rabbit broker is considered down if heartbeat's keep-alive fails (0 disable the heartbeat). EXPERIMENTAL = 1.0 (FloatOpt) How long to wait before reconnecting in response to an AMQP consumer cancel notification. + + = 60 + (IntOpt) How long to wait before considering a reconnect attempt to have failed. This value should not be longer than rpc_response_timeout. + = (StrOpt) SSL certification authority file (valid only if SSL enabled). @@ -106,8 +110,8 @@ (StrOpt) The RabbitMQ virtual host. - = 30 - (IntOpt) Size of RPC connection pool. + = False + (BoolOpt) Send a single AMQP reply to call message. The current behaviour since oslo-incubator is to send two AMQP replies - first one with the payload, a second one to ensure the other have finish to send the payload. We are going to remove it in the N release, but we must keep backward compatible at the same time. This option provides such compatibility - it defaults to False in Liberty and can be turned on for early adopters with a new installations or for testing. Please note, that this option will be removed in M release. diff --git a/doc/common/tables/sahara-rpc.xml b/doc/common/tables/sahara-rpc.xml index ea7ef94ecb..8740b47a97 100644 --- a/doc/common/tables/sahara-rpc.xml +++ b/doc/common/tables/sahara-rpc.xml @@ -33,6 +33,10 @@ = 30 (IntOpt) Seconds to wait before a cast expires (TTL). Only supported by impl_zmq. + + = 30 + (IntOpt) Size of RPC connection pool. + = 60 (IntOpt) Seconds to wait for a response from a call. @@ -41,6 +45,17 @@ = 64 (IntOpt) Size of RPC thread pool. + + [oslo_concurrency] + + + = False + (BoolOpt) Enables or disables inter-process locks. + + + = None + (StrOpt) Directory to use for lock files. For security, the specified directory should only be writable by the user running the processes that need locking. Defaults to environment variable OSLO_LOCK_PATH. If external locks are used, a lock path must be set. + [oslo_messaging_amqp] diff --git a/doc/config-reference/ch_dataprocessingserviceconfigure.xml b/doc/config-reference/ch_dataprocessingserviceconfigure.xml index 9a5ca71672..bd24cb134a 100644 --- a/doc/config-reference/ch_dataprocessingserviceconfigure.xml +++ b/doc/config-reference/ch_dataprocessingserviceconfigure.xml @@ -14,14 +14,14 @@ Data processing service configuration options. + - + - diff --git a/tools/autogenerate-config-flagmappings/sahara.flagmappings b/tools/autogenerate-config-flagmappings/sahara.flagmappings index f332f2a3a0..d27d77c38b 100644 --- a/tools/autogenerate-config-flagmappings/sahara.flagmappings +++ b/tools/autogenerate-config-flagmappings/sahara.flagmappings @@ -20,11 +20,6 @@ instance_uuid_format logging job_binary_max_KB common job_canceling_timeout common job_workflow_postfix common -log-config-append logging -log-date-format logging -log-dir logging -log-file logging -log-format logging log_config_append logging log_date_format logging log_dir logging @@ -57,6 +52,7 @@ remote common rootwrap_command common rpc_backend rpc rpc_cast_timeout rpc +rpc_conn_pool_size rpc rpc_response_timeout rpc rpc_thread_pool_size rpc rpc_zmq_bind_address zeromq @@ -66,13 +62,9 @@ rpc_zmq_ipc_dir zeromq rpc_zmq_matchmaker zeromq rpc_zmq_port zeromq rpc_zmq_topic_backlog zeromq -run_external_periodic_tasks common swift_topology_file common -syslog-log-facility logging syslog_log_facility logging transport_url amqp -use-syslog logging -use-syslog-rfc-format logging use_domain_for_proxy_users domain use_external_key_manager common use_floating_ips common @@ -88,6 +80,18 @@ cinder/api_insecure clients cinder/api_version clients cinder/ca_file clients conductor/use_local common +cors/allow_credentials cors +cors/allow_headers cors +cors/allow_methods cors +cors/allowed_origin cors +cors/expose_headers cors +cors/max_age cors +cors.subdomain/allow_credentials cors +cors.subdomain/allow_headers cors +cors.subdomain/allow_methods cors +cors.subdomain/allowed_origin cors +cors.subdomain/expose_headers cors +cors.subdomain/max_age cors database/backend database database/connection database database/connection_debug database @@ -157,6 +161,8 @@ neutron/api_insecure clients neutron/ca_file clients nova/api_insecure clients nova/ca_file clients +oslo_concurrency/disable_process_locking rpc +oslo_concurrency/lock_path rpc oslo_messaging_amqp/allow_insecure_clients rpc oslo_messaging_amqp/broadcast_prefix rpc oslo_messaging_amqp/container_name rpc @@ -181,13 +187,14 @@ oslo_messaging_qpid/qpid_sasl_mechanisms qpid oslo_messaging_qpid/qpid_tcp_nodelay qpid oslo_messaging_qpid/qpid_topology_version qpid oslo_messaging_qpid/qpid_username qpid -oslo_messaging_qpid/rpc_conn_pool_size qpid +oslo_messaging_qpid/send_single_reply qpid oslo_messaging_rabbit/amqp_auto_delete rabbitmq oslo_messaging_rabbit/amqp_durable_queues rabbitmq oslo_messaging_rabbit/fake_rabbit rabbitmq oslo_messaging_rabbit/heartbeat_rate rabbitmq oslo_messaging_rabbit/heartbeat_timeout_threshold rabbitmq oslo_messaging_rabbit/kombu_reconnect_delay rabbitmq +oslo_messaging_rabbit/kombu_reconnect_timeout rabbitmq oslo_messaging_rabbit/kombu_ssl_ca_certs rabbitmq oslo_messaging_rabbit/kombu_ssl_certfile rabbitmq oslo_messaging_rabbit/kombu_ssl_keyfile rabbitmq @@ -204,14 +211,14 @@ oslo_messaging_rabbit/rabbit_retry_interval rabbitmq oslo_messaging_rabbit/rabbit_use_ssl rabbitmq oslo_messaging_rabbit/rabbit_userid rabbitmq oslo_messaging_rabbit/rabbit_virtual_host rabbitmq -oslo_messaging_rabbit/rpc_conn_pool_size rabbitmq -oslo_middleware/max_request_body_size oslo_middleware +oslo_messaging_rabbit/send_single_reply rabbitmq +oslo_middleware/max_request_body_size api +oslo_middleware/secure_proxy_ssl_header api oslo_policy/policy_default_rule policy oslo_policy/policy_dirs policy oslo_policy/policy_file policy -ssl/ca_file ca -ssl/cert_file ca -ssl/key_file ca +retries/retries_number api +retries/retry_after api swift/api_insecure clients swift/ca_file clients timeouts/await_attach_volumes timeouts