Merge "[config-ref] fix nova wsgi configuration group"

doc/config-reference/source/compute/config-options.rst

@@ -56,4 +56,5 @@ OpenStack Compute service, run
 .. include:: ../tables/nova-vnc.rst
 .. include:: ../tables/nova-volumes.rst
 .. include:: ../tables/nova-vpn.rst
+.. include:: ../tables/nova-wsgi.rst
 .. include:: ../tables/nova-xen.rst

doc/config-reference/source/tables/nova-api.rst

@@ -58,8 +58,6 @@
      -
    * - ``max_request_body_size`` = ``114688``
      - (Integer) The maximum body size for each request, in bytes.
-   * - ``secure_proxy_ssl_header`` = ``X-Forwarded-Proto``
-     - (String) DEPRECATED: 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.
    * - **[oslo_versionedobjects]**
      -
    * - ``fatal_exception_format_errors`` = ``False``

doc/config-reference/source/tables/nova-wsgi.rst

@@ -0,0 +1,42 @@
+..
+    Warning: Do not edit this file. It is automatically generated from the
+    software project's code and your changes will be overwritten.
+
+    The tool to generate this file lives in openstack-doc-tools repository.
+
+    Please make any changes needed in the code, then run the
+    autogenerate-config-doc tool from the openstack-doc-tools repository, or
+    ask for help on the documentation mailing list, IRC channel or meeting.
+
+.. _nova-wsgi:
+
+.. list-table:: Description of WSGI configuration options
+   :header-rows: 1
+   :class: config-ref-table
+
+   * - Configuration option = Default value
+     - Description
+   * - **[DEFAULT]**
+     -
+   * - ``api_paste_config`` = ``api-paste.ini``
+     - (String) File name for the paste.deploy config for nova-api
+   * - ``client_socket_timeout`` = ``900``
+     - (Integer) Timeout for client connections' socket operations. If an incoming connection is idle for this number of seconds it will be closed. A value of '0' means wait forever.
+   * - ``max_header_line`` = ``16384``
+     - (Integer) Maximum line size of message headers to be accepted. max_header_line may need to be increased when using large tokens (typically those generated by the Keystone v3 API with big service catalogs).
+   * - ``secure_proxy_ssl_header`` = ``None``
+     - (String) The HTTP header used to determine the scheme for the original request, even if it was removed by an SSL terminating proxy. Typical value is "HTTP_X_FORWARDED_PROTO".
+   * - ``ssl_ca_file`` = ``None``
+     - (String) CA certificate file to use to verify connecting clients
+   * - ``ssl_cert_file`` = ``None``
+     - (String) SSL certificate of API server
+   * - ``ssl_key_file`` = ``None``
+     - (String) SSL private key of API server
+   * - ``tcp_keepidle`` = ``600``
+     - (Integer) Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not supported on OS X.
+   * - ``wsgi_default_pool_size`` = ``1000``
+     - (Integer) Size of the pool of greenthreads used by wsgi
+   * - ``wsgi_keep_alive`` = ``True``
+     - (Boolean) If False, closes the client socket connection explicitly.
+   * - ``wsgi_log_format`` = ``%(client_ip)s "%(request_line)s" status: %(status_code)s len: %(body_length)s time: %(wall_seconds).7f``
+     - (String) A python format string that is used as the template to generate log lines. The following values can be formatted into it: client_ip, date_time, request_line, status_code, body_length, wall_seconds.

tools/autogenerate-config-flagmappings/nova.flagmappings

@@ -793,17 +793,17 @@ workarounds/destroy_after_evacuate common
 workarounds/disable_libvirt_livesnapshot common
 workarounds/disable_rootwrap common
 workarounds/handle_virt_lifecycle_events common
-wsgi/api_paste_config Unknown
-wsgi/client_socket_timeout Unknown
-wsgi/default_pool_size Unknown
-wsgi/keep_alive Unknown
-wsgi/max_header_line Unknown
-wsgi/secure_proxy_ssl_header Unknown
-wsgi/ssl_ca_file Unknown
-wsgi/ssl_cert_file Unknown
-wsgi/ssl_key_file Unknown
-wsgi/tcp_keepidle Unknown
-wsgi/wsgi_log_format Unknown
+wsgi/api_paste_config wsgi
+wsgi/client_socket_timeout wsgi
+wsgi/default_pool_size wsgi
+wsgi/keep_alive wsgi
+wsgi/max_header_line wsgi
+wsgi/secure_proxy_ssl_header wsgi
+wsgi/ssl_ca_file wsgi
+wsgi/ssl_cert_file wsgi
+wsgi/ssl_key_file wsgi
+wsgi/tcp_keepidle wsgi
+wsgi/wsgi_log_format wsgi
 xenserver/agent_path xen
 xenserver/agent_resetnetwork_timeout xen
 xenserver/agent_timeout xen

tools/autogenerate-config-flagmappings/nova.headers

@@ -24,5 +24,6 @@ trustedcomputing trusted computing
 upgrade_levels upgrade levels
 vnc VNC
 volumes volumes
+wsgi WSGI
 xen Xen
 xvpvncproxy XCP VNC proxy