diff --git a/doc/common/tables/sahara-clients.xml b/doc/common/tables/sahara-clients.xml index e20eb09f93..5091975e76 100644 --- a/doc/common/tables/sahara-clients.xml +++ b/doc/common/tables/sahara-clients.xml @@ -29,6 +29,10 @@ = None (StrOpt) Location of ca certificates file to use for cinder client requests. + + = internalURL + (StrOpt) Endpoint type for cinder client requests + [heat] @@ -40,6 +44,10 @@ = None (StrOpt) Location of ca certificates file to use for heat client requests. + + = internalURL + (StrOpt) Endpoint type for heat client requests + [keystone] @@ -51,6 +59,25 @@ = None (StrOpt) Location of ca certificates file to use for keystone client requests. + + = internalURL + (StrOpt) Endpoint type for keystone client requests + + + [manila] + + + = True + (BoolOpt) Allow to perform insecure SSL requests to manila. + + + = 1 + (IntOpt) Version of the manila API to use. + + + = None + (StrOpt) Location of ca certificates file to use for manila client requests. + [neutron] @@ -62,6 +89,10 @@ = None (StrOpt) Location of ca certificates file to use for neutron client requests. + + = internalURL + (StrOpt) Endpoint type for neutron client requests + [nova] @@ -73,6 +104,10 @@ = None (StrOpt) Location of ca certificates file to use for nova client requests. + + = internalURL + (StrOpt) Endpoint type for nova client requests + [swift] @@ -84,6 +119,10 @@ = None (StrOpt) Location of ca certificates file to use for swift client requests. + + = internalURL + (StrOpt) Endpoint type for swift client requests + diff --git a/doc/common/tables/sahara-common.xml b/doc/common/tables/sahara-common.xml index a67e0288bb..ecc0cdfaaf 100644 --- a/doc/common/tables/sahara-common.xml +++ b/doc/common/tables/sahara-common.xml @@ -33,6 +33,10 @@ = 0 (IntOpt) Maximal time (in hours) for clusters allowed to be in states other than "Active", "Deleting" or "Error". If a cluster is not in "Active", "Deleting" or "Error" state and last update of it was longer than "cleanup_time_for_incomplete_clusters" hours ago then it will be deleted automatically. (0 value means that automatic clean up is disabled). + + = 24 + (IntOpt) Defines the period of time (in hours) after which trusts created to allow sahara to create or scale a cluster will expire. Note that this value should be significantly larger than the value of the cleanup_time_for_incomplete_clusters configuration key if use of the cluster cleanup feature is desired (the trust must last at least as long as a cluster could validly take to stall in its creation, plus the timeout value set in that key, plus one hour for the period of the cleanup job). + = 70 (IntOpt) The same as global_remote_threshold, but for a single cluster. @@ -41,6 +45,10 @@ = etc/sahara/compute.topology (StrOpt) File with nova compute topology. It should contain mapping between nova computes and racks. + + = pool.ntp.org + (StrOpt) Default ntp server for time sync + = False (BoolOpt) Disables event log feature. @@ -57,6 +65,10 @@ = False (BoolOpt) Enables sending notifications to Ceilometer + + = 64 + (IntOpt) Size of executor thread pool. + = 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. diff --git a/doc/common/tables/sahara-logging.xml b/doc/common/tables/sahara-logging.xml index 601804b3cf..946d535342 100644 --- a/doc/common/tables/sahara-logging.xml +++ b/doc/common/tables/sahara-logging.xml @@ -19,7 +19,7 @@ = False - (BoolOpt) Print debugging output (set logging level to DEBUG instead of default WARNING level). + (BoolOpt) Print debugging output (set logging level to DEBUG instead of default INFO 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, neutronclient=INFO @@ -91,11 +91,11 @@ = 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. + (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. - = False - (BoolOpt) Print more verbose output (set logging level to INFO instead of default WARNING level). + = True + (BoolOpt) If set to false, will disable INFO logging level, making WARNING the default. diff --git a/doc/common/tables/sahara-qpid.xml b/doc/common/tables/sahara-qpid.xml index e085bf0ab8..e753e048f2 100644 --- a/doc/common/tables/sahara-qpid.xml +++ b/doc/common/tables/sahara-qpid.xml @@ -71,7 +71,7 @@ = 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. + (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 the Mitaka release. diff --git a/doc/common/tables/sahara-rabbitmq.xml b/doc/common/tables/sahara-rabbitmq.xml index 6060d73178..841e1e362d 100644 --- a/doc/common/tables/sahara-rabbitmq.xml +++ b/doc/common/tables/sahara-rabbitmq.xml @@ -111,7 +111,7 @@ = 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. + (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 the Mitaka release. diff --git a/doc/common/tables/sahara-rpc.xml b/doc/common/tables/sahara-rpc.xml index 8740b47a97..2bea3258ca 100644 --- a/doc/common/tables/sahara-rpc.xml +++ b/doc/common/tables/sahara-rpc.xml @@ -41,10 +41,6 @@ = 60 (IntOpt) Seconds to wait for a response from a call. - - = 64 - (IntOpt) Size of RPC thread pool. - [oslo_concurrency] diff --git a/tools/autogenerate-config-flagmappings/sahara.flagmappings b/tools/autogenerate-config-flagmappings/sahara.flagmappings index d27d77c38b..76e08fd3fc 100644 --- a/tools/autogenerate-config-flagmappings/sahara.flagmappings +++ b/tools/autogenerate-config-flagmappings/sahara.flagmappings @@ -2,16 +2,19 @@ admin_project_domain_name common admin_user_domain_name common api_workers common cleanup_time_for_incomplete_clusters common +cluster_operation_trust_expiration_hours common cluster_remote_threshold common compute_topology_file common control_exchange amqp db_driver database debug logging default_log_levels logging +default_ntp_server common disable_event_log common enable_data_locality common enable_hypervisor_awareness common enable_notifications common +executor_thread_pool_size common fatal_deprecations logging global_remote_threshold common infrastructure_engine common @@ -54,7 +57,6 @@ 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 rpc_zmq_contexts zeromq rpc_zmq_host zeromq @@ -79,6 +81,7 @@ verbose logging cinder/api_insecure clients cinder/api_version clients cinder/ca_file clients +cinder/endpoint_type clients conductor/use_local common cors/allow_credentials cors cors/allow_headers cors @@ -114,8 +117,10 @@ database/sqlite_synchronous database database/use_db_reconnect database heat/api_insecure clients heat/ca_file clients +heat/endpoint_type clients keystone/api_insecure clients keystone/ca_file clients +keystone/endpoint_type clients keystone_authtoken/admin_password auth_token keystone_authtoken/admin_tenant_name auth_token keystone_authtoken/admin_token auth_token @@ -153,14 +158,19 @@ keystone_authtoken/memcached_servers common keystone_authtoken/revocation_cache_time auth_token keystone_authtoken/signing_dir auth_token keystone_authtoken/token_cache_time auth_token +manila/api_insecure clients +manila/api_version clients +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 oslo_concurrency/disable_process_locking rpc oslo_concurrency/lock_path rpc oslo_messaging_amqp/allow_insecure_clients rpc @@ -221,6 +231,7 @@ retries/retries_number api retries/retry_after api swift/api_insecure clients swift/ca_file clients +swift/endpoint_type clients timeouts/await_attach_volumes timeouts timeouts/await_for_instances_active timeouts timeouts/delete_instances_timeout timeouts