diff --git a/doc/common/tables/sahara-auth_token.xml b/doc/common/tables/sahara-auth_token.xml index 16b4e6c30c..c9b2b47ca2 100644 --- a/doc/common/tables/sahara-auth_token.xml +++ b/doc/common/tables/sahara-auth_token.xml @@ -149,6 +149,10 @@ = False (BoolOpt) (Optional) Use the advanced (eventlet safe) memcached client pool. The advanced pool will only work under python 2.x. + + = None + (StrOpt) The region in which the identity server can be found. + = 10 (IntOpt) Determines the frequency at which the list of revoked tokens is retrieved from the Identity service (in seconds). A high number of revocation events combined with a low cache duration may significantly reduce performance. diff --git a/doc/common/tables/sahara-common.xml b/doc/common/tables/sahara-common.xml index ecc0cdfaaf..7ea2b6af07 100644 --- a/doc/common/tables/sahara-common.xml +++ b/doc/common/tables/sahara-common.xml @@ -73,6 +73,10 @@ = 100 (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. + + = data-processing-cluster + (ListOpt) List of tags to be used during operating with stack. + = heat (StrOpt) An engine which will be used to provision infrastructure for Hadoop cluster. diff --git a/doc/common/tables/sahara-logging.xml b/doc/common/tables/sahara-logging.xml index 946d535342..f78a50deb0 100644 --- a/doc/common/tables/sahara-logging.xml +++ b/doc/common/tables/sahara-logging.xml @@ -23,7 +23,7 @@ = 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. + (ListOpt) List of logger=LEVEL pairs. This option is ignored if log_config_append is set. = False @@ -39,23 +39,23 @@ = 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. + (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. Note that when logging configuration files are used then all logging configuration is set in the configuration file and other logging configuration options are ignored (for example, log_format). = %Y-%m-%d %H:%M:%S - (StrOpt) Format string for %%(asctime)s in log records. Default: %(default)s . + (StrOpt) Format string for %%(asctime)s in log records. Default: %(default)s . This option is ignored if log_config_append is set. = None - (StrOpt) (Optional) The base directory used for relative --log-file paths. + (StrOpt) (Optional) The base directory used for relative --log-file paths. This option is ignored if log_config_append is set. = None - (StrOpt) (Optional) Name of log file to output to. If no default is set, logging will go to stdout. + (StrOpt) (Optional) Name of log file to output to. If no default is set, logging will go to stdout. This option is ignored if log_config_append is set. = 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. + (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. This option is ignored if log_config_append is set. = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s @@ -79,24 +79,28 @@ = LOG_USER - (StrOpt) Syslog facility to receive log lines. + (StrOpt) Syslog facility to receive log lines. This option is ignored if log_config_append is set. = True - (BoolOpt) Log output to standard error. + (BoolOpt) Log output to standard error. This option is ignored if log_config_append is set. = False - (BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED and will be changed later to honor RFC5424. + (BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED and will be changed later to honor RFC5424. This option is ignored if log_config_append is set. = 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 Kilo, and will be removed in Mitaka, along with this option. + (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 Kilo, and will be removed in Mitaka, along with this option. This option is ignored if log_config_append is set. = True (BoolOpt) If set to false, will disable INFO logging level, making WARNING the default. + + = False + (BoolOpt) (Optional) Uses logging handler designed to watch file system. When log file is moved or removed this handler will open a new log file with specified path instantaneously. It makes sense only if log-file option is specified and Linux platform is used. This option is ignored if log_config_append is set. + diff --git a/doc/common/tables/sahara-object_store_access.xml b/doc/common/tables/sahara-object_store_access.xml new file mode 100644 index 0000000000..cc783765ad --- /dev/null +++ b/doc/common/tables/sahara-object_store_access.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of Auth options for Swift access for VM configuration options
Configuration option = Default valueDescription
[object_store_access]
= None(StrOpt) Location of ca certificate file to use for identity client requests via public endpoint
= None(StrOpt) Location of ca certificate file to use for object-store client requests via public endpoint
+ diff --git a/doc/common/tables/sahara-redis.xml b/doc/common/tables/sahara-redis.xml index 55415f9e6b..aaaf0a0b6a 100644 --- a/doc/common/tables/sahara-redis.xml +++ b/doc/common/tables/sahara-redis.xml @@ -15,14 +15,14 @@ - [matchmaker_redis] + [DEFAULT] = 127.0.0.1 (StrOpt) Host to locate redis. - = None + = (StrOpt) Password for Redis server (optional). @@ -30,11 +30,19 @@ (IntOpt) Use this port to connect to redis host. - [matchmaker_ring] + [matchmaker_redis] - = /etc/oslo/matchmaker_ring.json - (StrOpt) Matchmaker ring file (JSON). + = 127.0.0.1 + (StrOpt) Host to locate redis. + + + = + (StrOpt) Password for Redis server (optional). + + + = 6379 + (IntOpt) Use this port to connect to redis host. diff --git a/doc/common/tables/sahara-rpc.xml b/doc/common/tables/sahara-rpc.xml index 2bea3258ca..f569724d72 100644 --- a/doc/common/tables/sahara-rpc.xml +++ b/doc/common/tables/sahara-rpc.xml @@ -17,14 +17,6 @@ [DEFAULT] - - = 300 - (IntOpt) Heartbeat frequency. - - - = 600 - (IntOpt) Heartbeat time-to-live. - = rabbit (StrOpt) The messaging driver to use, defaults to rabbit. Other drivers include qpid and zmq. @@ -37,6 +29,10 @@ = 30 (IntOpt) Size of RPC connection pool. + + = 1 + (IntOpt) The default number of seconds that poll should wait. Poll raises timeout exception when timeout expired. + = 60 (IntOpt) Seconds to wait for a response from a call. @@ -75,6 +71,22 @@ = 0 (IntOpt) Timeout for inactive connections (in seconds) + + = + (StrOpt) Password for message broker authentication + + + = + (StrOpt) Path to directory that contains the SASL configuration + + + = + (StrOpt) Name of configuration file (without .conf suffix) + + + = + (StrOpt) Space separated list of acceptable SASL mechanisms + = exclusive (StrOpt) address prefix used when sending to a specific server @@ -99,6 +111,10 @@ = False (BoolOpt) Debug: dump AMQP frames to stdout + + = + (StrOpt) User name for message broker authentication + diff --git a/doc/common/tables/sahara-zeromq.xml b/doc/common/tables/sahara-zeromq.xml index d5fa1ad9da..f8f00b6248 100644 --- a/doc/common/tables/sahara-zeromq.xml +++ b/doc/common/tables/sahara-zeromq.xml @@ -17,10 +17,18 @@ [DEFAULT] + + = True + (BoolOpt) Use REQ/REP pattern for all methods CALL/CAST/FANOUT. + = * (StrOpt) ZeroMQ bind address. Should be a wildcard (*), an ethernet interface, or IP. The "host" option should point or resolve to this address. + + = eventlet + (StrOpt) Type of concurrency used. Either "native" or "eventlet" + = 1 (IntOpt) Number of ZeroMQ contexts, defaults to 1. @@ -34,17 +42,17 @@ (StrOpt) Directory for holding IPC sockets. - = local + = redis (StrOpt) MatchMaker driver. - - = 9501 - (IntOpt) ZeroMQ receiver listening port. - = None (IntOpt) Maximum number of ingress messages to locally buffer per topic. Default is unlimited. + + = True + (BoolOpt) Shows whether zmq-messaging uses broker or not. + diff --git a/doc/config-reference/ch_dataprocessingserviceconfigure.xml b/doc/config-reference/ch_dataprocessingserviceconfigure.xml index 18cb0ece18..e5d7074cd5 100644 --- a/doc/config-reference/ch_dataprocessingserviceconfigure.xml +++ b/doc/config-reference/ch_dataprocessingserviceconfigure.xml @@ -22,6 +22,7 @@ + diff --git a/tools/autogenerate-config-flagmappings/sahara.flagmappings b/tools/autogenerate-config-flagmappings/sahara.flagmappings index 76e08fd3fc..444e5778ce 100644 --- a/tools/autogenerate-config-flagmappings/sahara.flagmappings +++ b/tools/autogenerate-config-flagmappings/sahara.flagmappings @@ -17,6 +17,8 @@ enable_notifications common executor_thread_pool_size common fatal_deprecations logging global_remote_threshold common +heat_stack_tags common +host redis infrastructure_engine common instance_format logging instance_uuid_format logging @@ -32,8 +34,6 @@ logging_context_format_string logging logging_debug_format_suffix logging logging_default_format_string logging logging_exception_prefix logging -matchmaker_heartbeat_freq rpc -matchmaker_heartbeat_ttl rpc max_header_line common memcached_servers common min_transient_cluster_active_time common @@ -43,10 +43,12 @@ notification_level amqp notification_publisher_id amqp notification_topics amqp os_region_name common +password redis periodic_enable common periodic_fuzzy_delay common periodic_interval_max common plugins common +port redis proxy_command common proxy_user_domain_name domain proxy_user_role_names domain @@ -56,13 +58,15 @@ rootwrap_command common rpc_backend rpc rpc_cast_timeout rpc rpc_conn_pool_size rpc +rpc_poll_timeout rpc rpc_response_timeout rpc +rpc_zmq_all_req_rep zeromq rpc_zmq_bind_address zeromq +rpc_zmq_concurrency zeromq rpc_zmq_contexts zeromq rpc_zmq_host zeromq rpc_zmq_ipc_dir zeromq rpc_zmq_matchmaker zeromq -rpc_zmq_port zeromq rpc_zmq_topic_backlog zeromq swift_topology_file common syslog_log_facility logging @@ -78,6 +82,8 @@ use_stderr logging use_syslog logging use_syslog_rfc_format logging verbose logging +watch_log_file logging +zmq_use_broker zeromq cinder/api_insecure clients cinder/api_version clients cinder/ca_file clients @@ -155,6 +161,7 @@ keystone_authtoken/memcache_secret_key auth_token keystone_authtoken/memcache_security_strategy auth_token keystone_authtoken/memcache_use_advanced_pool auth_token keystone_authtoken/memcached_servers common +keystone_authtoken/region_name auth_token keystone_authtoken/revocation_cache_time auth_token keystone_authtoken/signing_dir auth_token keystone_authtoken/token_cache_time auth_token @@ -164,13 +171,14 @@ manila/ca_file clients matchmaker_redis/host redis matchmaker_redis/password redis matchmaker_redis/port redis -matchmaker_ring/ringfile redis neutron/api_insecure clients neutron/ca_file clients neutron/endpoint_type clients nova/api_insecure clients nova/ca_file clients nova/endpoint_type clients +object_store_access/public_identity_ca_file object_store_access +object_store_access/public_object_store_ca_file object_store_access oslo_concurrency/disable_process_locking rpc oslo_concurrency/lock_path rpc oslo_messaging_amqp/allow_insecure_clients rpc @@ -178,12 +186,17 @@ oslo_messaging_amqp/broadcast_prefix rpc oslo_messaging_amqp/container_name rpc oslo_messaging_amqp/group_request_prefix rpc oslo_messaging_amqp/idle_timeout rpc +oslo_messaging_amqp/password rpc +oslo_messaging_amqp/sasl_config_dir rpc +oslo_messaging_amqp/sasl_config_name rpc +oslo_messaging_amqp/sasl_mechanisms rpc oslo_messaging_amqp/server_request_prefix rpc oslo_messaging_amqp/ssl_ca_file rpc oslo_messaging_amqp/ssl_cert_file rpc oslo_messaging_amqp/ssl_key_file rpc oslo_messaging_amqp/ssl_key_password rpc oslo_messaging_amqp/trace rpc +oslo_messaging_amqp/username rpc oslo_messaging_qpid/amqp_auto_delete qpid oslo_messaging_qpid/amqp_durable_queues qpid oslo_messaging_qpid/qpid_heartbeat qpid diff --git a/tools/autogenerate-config-flagmappings/sahara.headers b/tools/autogenerate-config-flagmappings/sahara.headers index 31eceb3b44..d026002b77 100644 --- a/tools/autogenerate-config-flagmappings/sahara.headers +++ b/tools/autogenerate-config-flagmappings/sahara.headers @@ -1 +1,2 @@ domain domain +object_store_access Auth options for Swift access for VM