[config-ref] Tables update before release

Change-Id: Ice62ca5af01c83d1f58346647b2d3f300f4c5e3c

doc/config-reference/source/tables/aodh-amqp.rst

@@ -20,7 +20,5 @@
      -
    * - ``control_exchange`` = ``openstack``
      - (String) The default exchange under which topics are scoped. May be overridden by an exchange name specified in the transport_url option.
-   * - ``ipc_protocol`` = ``queue``
-     - (String) The protocol used to communicate between evaluator and notifier services.
    * - ``transport_url`` = ``None``
      - (String) A URL representing the messaging driver to use and its full configuration. If not set, we fall back to the rpc_backend option and driver specific configuration.

doc/config-reference/source/tables/aodh-common.rst

@@ -28,16 +28,12 @@
      - (String) The topic that aodh uses for event alarm evaluation.
    * - ``executor_thread_pool_size`` = ``64``
      - (Integer) Size of executor thread pool.
-   * - ``gnocchi_url`` = ``None``
-     - (String) DEPRECATED: URL to Gnocchi. default: autodetection
    * - ``host`` = ``localhost``
      - (String) Name of this node, which must be valid in an AMQP key. Can be an opaque identifier. For ZeroMQ only, must be a valid host name, FQDN, or IP address.
    * - ``http_timeout`` = ``600``
      - (Integer) Timeout seconds for HTTP requests. Set it to None to disable timeout.
    * - ``memcached_servers`` = ``None``
      - (List) Memcached servers or None for in process cache.
-   * - ``notifier_rpc_topic`` = ``alarm_notifier``
-     - (String) The topic that aodh uses for alarm notifier messages.
    * - ``notifier_topic`` = ``alarming``
      - (String) The topic that aodh uses for alarm notifier messages.
    * - ``project_alarm_quota`` = ``None``

doc/config-reference/source/tables/ceilometer-collector.rst

@@ -22,10 +22,6 @@
      - (Integer) Number of notification messages to wait before dispatching them
    * - ``batch_timeout`` = ``None``
      - (Integer) Number of seconds to wait before dispatching sampleswhen batch_size is not reached (None means indefinitely)
-   * - ``requeue_event_on_dispatcher_error`` = ``False``
-     - (Boolean) Requeue the event on the collector event queue when the collector fails to dispatch it.
-   * - ``requeue_sample_on_dispatcher_error`` = ``False``
-     - (Boolean) Requeue the sample on the collector sample queue when the collector fails to dispatch it. This is only valid if the sample come from the notifier publisher.
    * - ``udp_address`` = ``0.0.0.0``
      - (String) Address to which the UDP socket is bound. Set to an empty string to disable.
    * - ``udp_port`` = ``4952``

doc/config-reference/source/tables/ceilometer-glance.rst

@@ -19,4 +19,4 @@
    * - **[DEFAULT]**
      -
    * - ``glance_page_size`` = ``0``
-     - (Integer) Number of items to request in each paginated Glance API request (parameter used by glancecelient). If this is less than or equal to 0, page size is not specified (default value in glanceclient is used).
+     - (Integer) Number of items to request in each paginated Glance API request (parameter used by glanceclient). If this is less than or equal to 0, page size is not specified (default value in glanceclient is used).

doc/config-reference/source/tables/cinder-images.rst

@@ -22,7 +22,7 @@
      - (List) A list of url schemes that can be downloaded directly via the direct_url. Currently supported schemes: [file].
    * - ``glance_api_insecure`` = ``False``
      - (Boolean) Allow to perform insecure SSL (https) requests to glance
-   * - ``glance_api_servers`` = ``$glance_host:$glance_port``
+   * - ``glance_api_servers`` = ``None``
      - (List) A list of the URLs of glance API servers available to cinder ([http[s]://][hostname|ip]:port). If protocol is not specified it defaults to http.
    * - ``glance_api_ssl_compression`` = ``False``
      - (Boolean) Enables or disables negotiation of SSL layer compression. In some cases disabling compression can improve data throughput, such as when high network bandwidth is available and you use compressed image formats like qcow2.
@@ -30,14 +30,12 @@
      - (Integer) Version of the glance API to use
    * - ``glance_ca_certificates_file`` = ``None``
      - (String) Location of ca certificates file to use for glance client requests.
+   * - ``glance_catalog_info`` = ``image:glance:publicURL``
+     - (String) Info to match when looking for glance in the service catalog. Format is: separated values of the form: <service_type>:<service_name>:<endpoint_type> - Only used if glance_api_servers are not provided.
    * - ``glance_core_properties`` = ``checksum, container_format, disk_format, image_name, image_id, min_disk, min_ram, name, size``
      - (List) Default core properties of image
-   * - ``glance_host`` = ``$my_ip``
-     - (String) Default glance host name or IP
    * - ``glance_num_retries`` = ``0``
      - (Integer) Number retries when downloading an image from glance
-   * - ``glance_port`` = ``9292``
-     - (Integer) Default glance port
    * - ``glance_request_timeout`` = ``None``
      - (Integer) http/https timeout value for glance operations. If no value (None) is supplied here, the glanceclient default value is used.
    * - ``image_conversion_dir`` = ``$state_path/conversion``

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

@@ -50,6 +50,8 @@
      - (Boolean) When true, this option sets the owner of an image to be the tenant. Otherwise, the owner of the image will be the authenticated user issuing the request.
    * - ``public_endpoint`` = ``None``
      - (String) Public url to use for versions endpoint. The default is None, which will use the request's host_url attribute to populate the URL base. If Glance is operating behind a proxy, you will want to change this to represent the proxy's URL.
+   * - ``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".
    * - ``send_identity_headers`` = ``False``
      - (Boolean) Whether to pass through headers containing user and tenant information when making requests to the registry. This allows the registry to use the context middleware without keystonemiddleware's auth_token middleware, removing calls to the keystone auth service. It is recommended that when using this option, secure communication between glance api and glance registry is ensured by means other than auth_token middleware.
    * - ``show_multiple_locations`` = ``False``

doc/config-reference/source/tables/heat-testing.rst

@@ -18,6 +18,8 @@
      - Description
    * - **[profiler]**
      -
+   * - ``enabled`` = ``False``
+     - (Boolean) Enables the profiling for all services on this node. Default value is False (fully disable the profiling feature). Possible values: * True: Enables the feature * False: Disables the feature. The profiling cannot be started via this project operations. If the profiling is triggered by another project, this project part will be empty.
    * - ``hmac_keys`` = ``SECRET_KEY``
      - (String) Secret key(s) to use for encrypting context data for performance profiling. This string value should have the following format: <key1>[,<key2>,...<keyn>], where each key is some random string. A user who triggers the profiling via the REST API has to set one of these keys in the headers of the REST API call to include profiling results of this node for this particular project. Both "enabled" flag and "hmac_keys" config options should be set to enable profiling. Also, to generate correct profiling information across all services at least one key needs to be consistent between OpenStack projects. This ensures it can be used from client side to generate the trace, containing information from all possible resources.
    * - ``trace_sqlalchemy`` = ``False``

doc/config-reference/source/tables/ironic-deploy.rst

@@ -26,3 +26,5 @@
      - (String) ironic-conductor node's HTTP root path.
    * - ``http_url`` = ``None``
      - (String) ironic-conductor node's HTTP server URL. Example: http://192.1.2.3:8080
+   * - ``power_off_after_deploy_failure`` = ``True``
+     - (Boolean) Whether to power off a node after deploy failure. Defaults to True.

doc/config-reference/source/tables/ironic-ilo.rst

@@ -19,7 +19,7 @@
    * - **[ilo]**
      -
    * - ``clean_priority_clear_secure_boot_keys`` = ``0``
-     - (Integer) Priority for clear_secure_boot_keys clean step. This step is not enabled by default. It can be enabled to to clear all secure boot keys enrolled with iLO.
+     - (Integer) Priority for clear_secure_boot_keys clean step. This step is not enabled by default. It can be enabled to clear all secure boot keys enrolled with iLO.
    * - ``clean_priority_erase_devices`` = ``None``
      - (Integer) Priority for erase devices clean step. If unset, it defaults to 10. If set to 0, the step will be disabled and will not run during cleaning.
    * - ``clean_priority_reset_bios_to_default`` = ``10``

doc/config-reference/source/tables/manila-compute.rst

@@ -19,22 +19,16 @@
    * - **[DEFAULT]**
      -
    * - ``nova_admin_auth_url`` = ``http://localhost:5000/v2.0``
-     - (String) Identity service URL.
+     - (String) DEPRECATED: Identity service URL. This option isn't used any longer. Please use [nova] url instead.
    * - ``nova_admin_password`` = ``None``
-     - (String) Nova admin password.
+     - (String) DEPRECATED: Nova admin password. This option isn't used any longer. Please use [nova] password instead.
    * - ``nova_admin_tenant_name`` = ``service``
-     - (String) Nova admin tenant name.
+     - (String) DEPRECATED: Nova admin tenant name. This option isn't used any longer. Please use [nova] tenant instead.
    * - ``nova_admin_username`` = ``nova``
-     - (String) Nova admin username.
-   * - ``nova_api_insecure`` = ``False``
-     - (Boolean) Allow to perform insecure SSL requests to nova.
-   * - ``nova_api_microversion`` = ``2.10``
-     - (String) Version of Nova API to be used.
-   * - ``nova_ca_certificates_file`` = ``None``
-     - (String) Location of CA certificates file to use for nova client requests.
+     - (String) DEPRECATED: Nova admin username. This option isn't used any longer. Please use [nova] username instead.
    * - ``nova_catalog_admin_info`` = ``compute:nova:adminURL``
-     - (String) Same as nova_catalog_info, but for admin endpoint.
+     - (String) DEPRECATED: Same as nova_catalog_info, but for admin endpoint. This option isn't used any longer.
    * - ``nova_catalog_info`` = ``compute:nova:publicURL``
-     - (String) Info to match when looking for nova in the service catalog. Format is separated values of the form: <service_type>:<service_name>:<endpoint_type>
+     - (String) DEPRECATED: Info to match when looking for nova in the service catalog. Format is separated values of the form: <service_type>:<service_name>:<endpoint_type> This option isn't used any longer.
    * - ``os_region_name`` = ``None``
      - (String) Region name of this node.

doc/config-reference/source/tables/manila-generic.rst

@@ -19,23 +19,15 @@
    * - **[DEFAULT]**
      -
    * - ``cinder_admin_auth_url`` = ``http://localhost:5000/v2.0``
-     - (String) Identity service URL.
+     - (String) DEPRECATED: Identity service URL. This option isn't used any longer. Please use [cinder] auth_url instead.
    * - ``cinder_admin_password`` = ``None``
-     - (String) Cinder admin password.
+     - (String) DEPRECATED: Cinder admin password. This option isn't used any longer. Please use [cinder] password instead.
    * - ``cinder_admin_tenant_name`` = ``service``
-     - (String) Cinder admin tenant name.
+     - (String) DEPRECATED: Cinder admin tenant name. This option isn't used any longer. Please use [cinder] tenant_name instead.
    * - ``cinder_admin_username`` = ``cinder``
-     - (String) Cinder admin username.
-   * - ``cinder_api_insecure`` = ``False``
-     - (Boolean) Allow to perform insecure SSL requests to cinder.
-   * - ``cinder_ca_certificates_file`` = ``None``
-     - (String) Location of CA certificates file to use for cinder client requests.
+     - (String) DEPRECATED: Cinder admin username. This option isn't used any longer. Please use [cinder] username instead.
    * - ``cinder_catalog_info`` = ``volume:cinder:publicURL``
-     - (String) Info to match when looking for cinder in the service catalog. Format is separated values of the form: <service_type>:<service_name>:<endpoint_type>
-   * - ``cinder_cross_az_attach`` = ``True``
-     - (Boolean) Allow attaching between instances and volumes in different availability zones.
-   * - ``cinder_http_retries`` = ``3``
-     - (Integer) Number of cinderclient retries on failed HTTP calls.
+     - (String) DEPRECATED: Info to match when looking for cinder in the service catalog. Format is separated values of the form: <service_type>:<service_name>:<endpoint_type> This option isn't used any longer.
    * - ``cinder_volume_type`` = ``None``
      - (String) Name or id of cinder volume type which will be used for all volumes created by driver.
    * - ``connect_share_server_to_tenant_network`` = ``False``
@@ -102,3 +94,61 @@
      - (String) Volume name template.
    * - ``volume_snapshot_name_template`` = ``manila-snapshot-%s``
      - (String) Volume snapshot name template.
+   * - **[cinder]**
+     -
+   * - ``api_insecure`` = ``False``
+     - (Boolean) Allow to perform insecure SSL requests to cinder.
+   * - ``auth_section`` = ``None``
+     - (Unknown) Config Section from which to load plugin specific options
+   * - ``auth_type`` = ``None``
+     - (Unknown) Authentication type to load
+   * - ``ca_certificates_file`` = ``None``
+     - (String) Location of CA certificates file to use for cinder client requests.
+   * - ``cafile`` = ``None``
+     - (String) PEM encoded Certificate Authority to use when verifying HTTPs connections.
+   * - ``certfile`` = ``None``
+     - (String) PEM encoded client certificate cert file
+   * - ``cross_az_attach`` = ``True``
+     - (Boolean) Allow attaching between instances and volumes in different availability zones.
+   * - ``http_retries`` = ``3``
+     - (Integer) Number of cinderclient retries on failed HTTP calls.
+   * - ``insecure`` = ``False``
+     - (Boolean) Verify HTTPS connections.
+   * - ``keyfile`` = ``None``
+     - (String) PEM encoded client certificate key file
+   * - ``timeout`` = ``None``
+     - (Integer) Timeout value for http requests
+   * - **[neutron]**
+     -
+   * - ``cafile`` = ``None``
+     - (String) PEM encoded Certificate Authority to use when verifying HTTPs connections.
+   * - ``certfile`` = ``None``
+     - (String) PEM encoded client certificate cert file
+   * - ``insecure`` = ``False``
+     - (Boolean) Verify HTTPS connections.
+   * - ``keyfile`` = ``None``
+     - (String) PEM encoded client certificate key file
+   * - ``timeout`` = ``None``
+     - (Integer) Timeout value for http requests
+   * - **[nova]**
+     -
+   * - ``api_insecure`` = ``False``
+     - (Boolean) Allow to perform insecure SSL requests to nova.
+   * - ``api_microversion`` = ``2.10``
+     - (String) Version of Nova API to be used.
+   * - ``auth_section`` = ``None``
+     - (Unknown) Config Section from which to load plugin specific options
+   * - ``auth_type`` = ``None``
+     - (Unknown) Authentication type to load
+   * - ``ca_certificates_file`` = ``None``
+     - (String) Location of CA certificates file to use for nova client requests.
+   * - ``cafile`` = ``None``
+     - (String) PEM encoded Certificate Authority to use when verifying HTTPs connections.
+   * - ``certfile`` = ``None``
+     - (String) PEM encoded client certificate cert file
+   * - ``insecure`` = ``False``
+     - (Boolean) Verify HTTPS connections.
+   * - ``keyfile`` = ``None``
+     - (String) PEM encoded client certificate key file
+   * - ``timeout`` = ``None``
+     - (Integer) Timeout value for http requests

doc/config-reference/source/tables/neutron-common.rst

@@ -66,8 +66,6 @@
      - (Integer) Size of executor thread pool.
    * - ``external_dns_driver`` = ``None``
      - (String) Driver for external DNS integration.
-   * - ``force_gateway_on_subnet`` = ``True``
-     - (Boolean) DEPRECATED: Ensure that configured gateway is on subnet. For IPv6, validate only if gateway is not a link local address. Deprecated, to be removed during the Newton release, at which point the gateway will not be forced on to subnet.
    * - ``global_physnet_mtu`` = ``1500``
      - (Integer) MTU of the underlying physical network. Neutron uses this value to calculate MTU for all virtual network components. For flat and VLAN networks, neutron uses this value without modification. For overlay networks such as VXLAN, neutron automatically subtracts the overlay protocol overhead from this value. Defaults to 1500, the standard value for Ethernet.
    * - ``ip_lib_force_root`` = ``False``

doc/config-reference/source/tables/neutron-linuxbridge_agent.rst

@@ -29,7 +29,7 @@
    * - **[VXLAN]**
      -
    * - ``arp_responder`` = ``False``
-     - (Boolean) Enable local ARP responder which provides local responses instead of performing ARP broadcast into the overlay. Enabling local ARP responder is not fullycompatible with the allowed-address-pairs extension.
+     - (Boolean) Enable local ARP responder which provides local responses instead of performing ARP broadcast into the overlay. Enabling local ARP responder is not fully compatible with the allowed-address-pairs extension.
    * - ``enable_vxlan`` = ``True``
      - (Boolean) Enable VXLAN on the agent. Can be enabled when agent is managed by ml2 plugin using linuxbridge mechanism driver
    * - ``l2_population`` = ``False``

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

@@ -18,12 +18,8 @@
      - Description
    * - **[DEFAULT]**
      -
-   * - ``api_paste_config`` = ``api-paste.ini``
-     - (String) File name for the paste.deploy config for nova-api
    * - ``api_rate_limit`` = ``False``
      - (Boolean) Whether to use per-user rate limiting for the api. This option is only used by v2 api. Rate limiting is removed from v2.1 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.
    * - ``enable_new_services`` = ``True``
      - (Boolean) Services to be added to the available pool on create
    * - ``enabled_apis`` = ``osapi_compute, metadata``
@@ -32,8 +28,6 @@
      - (List) A list of APIs with enabled SSL
    * - ``instance_name_template`` = ``instance-%08x``
      - (String) Template string to be used to generate instance names
-   * - ``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).
    * - ``multi_instance_display_name_template`` = ``%(name)s-%(count)d``
      - (String) When creating multiple instances with a single request using the os-multiple-create API extension, this template will be used to build the display name for each instance. The benefit is that the instances end up with different hostnames. To restore legacy behavior of every instance having the same name, set this option to "%(name)s". Valid keys for the template are: name, uuid, count.
    * - ``non_inheritable_image_properties`` = ``cache_in_nova, bittorrent``
@@ -54,22 +48,12 @@
      - (Integer) Number of workers for OpenStack API service. The default will be the number of CPUs available.
    * - ``osapi_hide_server_address_states`` = ``building``
      - (List) List of instance states that should hide network info
-   * - ``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".
    * - ``servicegroup_driver`` = ``db``
      - (String) The driver for servicegroup service.
    * - ``snapshot_name_template`` = ``snapshot-%s``
      - (String) Template string to be used to generate snapshot names
-   * - ``tcp_keepidle`` = ``600``
-     - (Integer) Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not supported on OS X.
    * - ``use_forwarded_for`` = ``False``
      - (Boolean) Treat X-Forwarded-For as the canonical remote address. Only enable this if you have a sanitizing proxy.
-   * - ``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.
    * - **[oslo_middleware]**
      -
    * - ``max_request_body_size`` = ``114688``

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

@@ -36,12 +36,6 @@
      - (String) Where we keep our keys
    * - ``project_cert_subject`` = ``/C=US/ST=California/O=OpenStack/OU=NovaDev/CN=project-ca-%.16s-%s``
      - (String) Subject for certificate for projects, %s for project, timestamp
-   * - ``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
    * - ``use_project_ca`` = ``False``
      - (Boolean) Should we use a CA for each project?
    * - ``user_cert_subject`` = ``/C=US/ST=California/O=OpenStack/OU=NovaDev/CN=%.16s-%.16s-%s``

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

@@ -19,13 +19,13 @@
    * - **[hyperv]**
      -
    * - ``dynamic_memory_ratio`` = ``1.0``
-     - (Floating point) Enables dynamic memory allocation (ballooning) when set to a value greater than 1. The value expresses the ratio between the total RAM assigned to an instance and its startup RAM amount. For example a ratio of 2.0 for an instance with 1024MB of RAM implies 512MB of RAM allocated at startup
+     - (Floating point) Dynamic memory ratio Enables dynamic memory allocation (ballooning) when set to a value greater than 1. The value expresses the ratio between the total RAM assigned to an instance and its startup RAM amount. For example a ratio of 2.0 for an instance with 1024MB of RAM implies 512MB of RAM allocated at startup. Possible values: * 1.0: Disables dynamic memory allocation (Default). * Float values greater than 1.0: Enables allocation of total implied RAM divided by this value for startup. Services which consume this: * nova-compute Related options: * None
    * - ``enable_instance_metrics_collection`` = ``False``
-     - (Boolean) Enables metrics collections for an instance by using Hyper-V's metric APIs. Collected data can by retrieved by other apps and services, e.g.: Ceilometer. Requires Hyper-V / Windows Server 2012 and above
+     - (Boolean) Enable instance metrics collection Enables metrics collections for an instance by using Hyper-V's metric APIs. Collected data can by retrieved by other apps and services, e.g.: Ceilometer. Possible values: * True: Enables metrics collection. * False: Disables metric collection (Default). Services which consume this: * nova-compute Related options: * None
    * - ``instances_path_share`` =
-     - (String) The name of a Windows share name mapped to the "instances_path" dir and used by the resize feature to copy files to the target host. If left blank, an administrative share will be used, looking for the same "instances_path" used locally
+     - (String) Instances path share The name of a Windows share mapped to the "instances_path" dir and used by the resize feature to copy files to the target host. If left blank, an administrative share (hidden network share) will be used, looking for the same "instances_path" used locally. Possible values: * "": An administrative share will be used (Default). * Name of a Windows share. Services which consume this: * nova-compute Related options: * "instances_path": The directory which will be used if this option here is left blank.
    * - ``limit_cpu_features`` = ``False``
-     - (Boolean) Required for live migration among hosts with different CPU features
+     - (Boolean) Limit CPU features This flag is needed to support live migration to hosts with different CPU features and checked during instance creation in order to limit the CPU features used by the instance. Possible values: * True: Limit processor-specific features. * False: Do not limit processor-specific features (Default). Services which consume this: * nova-compute Related options: * None
    * - ``mounted_disk_query_retry_count`` = ``10``
      - (Integer) The number of times to retry checking for a disk mounted via iSCSI.
    * - ``mounted_disk_query_retry_interval`` = ``5``

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

@@ -36,5 +36,7 @@
      - (Integer) How often to retry in seconds when a request does conflict
    * - ``api_version`` = ``1``
      - (Integer) DEPRECATED: Version of Ironic API service endpoint. DEPRECATED: Setting the API version is not possible anymore.
+   * - ``cafile`` = ``None``
+     - (String) PEM encoded Certificate Authority to use when verifying HTTPs connections.
    * - ``client_log_level`` = ``None``
      - (String) DEPRECATED: Log level override for ironicclient. Set this in order to override the global "default_log_levels", "verbose", and "debug" settings. DEPRECATED: use standard logging configuration.

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

@@ -39,13 +39,13 @@
    * - **[xenserver]**
      -
    * - ``agent_path`` = ``usr/sbin/xe-update-networking``
-     - (String) Specifies the path in which the XenAPI guest agent should be located. If the agent is present, network configuration is not injected into the image. Used if compute_driver=xenapi.XenAPIDriver and flat_injected=True
+     - (String) Path to locate guest agent on the server. Specifies the path in which the XenAPI guest agent should be located. If the agent is present, network configuration is not injected into the image. Used if compute_driver=xenapi.XenAPIDriver and flat_injected=True. Services which consume this: * ``nova-compute`` Possible values: * A valid path Related options: * ``flat_injected`` * ``compute_driver``
    * - ``agent_resetnetwork_timeout`` = ``60``
-     - (Integer) Number of seconds to wait for agent reply to resetnetwork request
+     - (Integer) Number of seconds to wait for agent's reply to resetnetwork request. This indicates the amount of time xapi 'agent' plugin waits for the agent to respond to the 'resetnetwork' request specifically. The generic timeout for agent communication ``agent_timeout`` is ignored in this case. Services which consume this: * ``nova-compute`` Possible values: * Any positive integer Related options: * None
    * - ``agent_timeout`` = ``30``
-     - (Integer) Number of seconds to wait for agent reply
+     - (Integer) Number of seconds to wait for agent's reply to a request. Nova configures/performs certain administrative actions on a server with the help of an agent that's installed on the server. The communication between Nova and the agent is achieved via sharing messages, called records, over xenstore, a shared storage across all the domains on a Xenserver host. Operations performed by the agent on behalf of nova are: 'version',' key_init', 'password','resetnetwork','inject_file', and 'agentupdate'. To perform one of the above operations, the xapi 'agent' plugin writes the command and its associated parameters to a certain location known to the domain and awaits response. On being notified of the message, the agent performs appropriate actions on the server and writes the result back to xenstore. This result is then read by the xapi 'agent' plugin to determine the success/failure of the operation. This config option determines how long the xapi 'agent' plugin shall wait to read the response off of xenstore for a given request/command. If the agent on the instance fails to write the result in this time period, the operation is considered to have timed out. Services which consume this: * ``nova-compute`` Possible values: * Any positive integer Related options: * ``agent_version_timeout`` * ``agent_resetnetwork_timeout``
    * - ``agent_version_timeout`` = ``300``
-     - (Integer) Number of seconds to wait for agent to be fully operational
+     - (Integer) Number of seconds to wait for agent't reply to version request. This indicates the amount of time xapi 'agent' plugin waits for the agent to respond to the 'version' request specifically. The generic timeout for agent communication ``agent_timeout`` is ignored in this case. During the build process the 'version' request is used to determine if the agent is available/operational to perform other requests such as 'resetnetwork', 'password', 'key_init' and 'inject_file'. If the 'version' call fails, the other configuration is skipped. So, this configuration option can also be interpreted as time in which agent is expected to be fully operational. Services which consume this: * ``nova-compute`` Possible values: * Any positive integer Related options: * None
    * - ``cache_images`` = ``all``
      - (String) Cache glance images locally. `all` will cache all images, `some` will only cache images that have the image_property `cache_in_nova=True`, and `none` turns off caching entirely
    * - ``check_host`` = ``True``
@@ -61,7 +61,7 @@
    * - ``default_os_type`` = ``linux``
      - (String) Default OS type
    * - ``disable_agent`` = ``False``
-     - (Boolean) Disables the use of the XenAPI agent in any image regardless of what image properties are present.
+     - (Boolean) Disables the use of XenAPI agent. This configuration option suggests whether the use of agent should be enabled or not regardless of what image properties are present. Image properties have an effect only when this is set to ``True``. Read description of config option ``use_agent_default`` for more information. Services which consume this: * ``nova-compute`` Possible values: * True * False Related options: * ``use_agent_default``
    * - ``image_compression_level`` = ``None``
      - (Integer) Compression level for images, e.g., 9 for gzip -9. Range is 1-9, 9 being most compressed but most CPU intensive on dom0.
    * - ``image_upload_handler`` = ``nova.virt.xenapi.image.glance.GlanceStore``
@@ -119,7 +119,7 @@
    * - ``torrent_seed_duration`` = ``3600``
      - (Integer) Number of seconds after downloading an image via BitTorrent that it should be seeded for other peers.
    * - ``use_agent_default`` = ``False``
-     - (Boolean) Determines if the XenAPI agent should be used when the image used does not contain a hint to declare if the agent is present or not. The hint is a glance property "xenapi_use_agent" that has the value "True" or "False". Note that waiting for the agent when it is not present will significantly increase server boot times.
+     - (Boolean) Whether or not to use the agent by default when its usage is enabled but not indicated by the image. The use of XenAPI agent can be disabled altogether using the configuration option ``disable_agent``. However, if it is not disabled, the use of an agent can still be controlled by the image in use through one of its properties, ``xenapi_use_agent``. If this property is either not present or specified incorrectly on the image, the use of agent is determined by this configuration option. Note that if this configuration is set to ``True`` when the agent is not present, the boot times will increase significantly. Services which consume this: * ``nova-compute`` Possible values: * True * False Related options: * ``disable_agent``
    * - ``use_join_force`` = ``True``
      - (Boolean) To use for hosts with different CPUs
    * - ``vhd_coalesce_max_attempts`` = ``20``

doc/config-reference/source/tables/trove-compute.rst

@@ -21,7 +21,7 @@
    * - ``ip_regex`` = ``None``
      - (String) List IP addresses that match this regular expression.
    * - ``nova_client_version`` = ``2.12``
-     - (String) The version of of the compute service client.
+     - (String) The version of the compute service client.
    * - ``nova_compute_endpoint_type`` = ``publicURL``
      - (String) Service endpoint type to use when searching catalog.
    * - ``nova_compute_service_type`` = ``compute``

doc/config-reference/source/tables/trove-swift.rst

@@ -23,4 +23,4 @@
    * - ``swift_service_type`` = ``object-store``
      - (String) Service type to use when searching catalog.
    * - ``swift_url`` = ``None``
-     - (String) URL ending in ``AUTH_``.
+     - (String) URL ending in AUTH.

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

@@ -24,6 +24,12 @@
      - (Boolean) Run Zaqar server in the background.
    * - ``unreliable`` = ``False``
      - (Boolean) Disable all reliability constraints.
+   * - **[certificates]**
+     -
+   * - ``barbican_auth`` = ``barbican_acl_auth``
+     - (String) Name of the Barbican authentication method to use
+   * - ``cert_manager_type`` = ``barbican``
+     - (String) Certificate Manager plugin. Defaults to barbican.
    * - **[notification]**
      -
    * - ``smtp_command`` = ``/usr/sbin/sendmail -t -oi``
@@ -36,6 +42,28 @@
      - (Multi-valued) Directories where policy configuration files are stored. They can be relative to any directory in the search path defined by the config_dir option, or absolute paths. The file defined by policy_file must exist for these directories to be searched. Missing or empty directories are ignored.
    * - ``policy_file`` = ``policy.json``
      - (String) The JSON file that defines policies.
+   * - **[service_auth]**
+     -
+   * - ``admin_password`` = ``password``
+     - (String) The service admin password
+   * - ``admin_project_domain`` = ``admin``
+     - (String) The admin project domain name
+   * - ``admin_tenant_name`` = ``admin``
+     - (String) The service admin tenant name
+   * - ``admin_user`` = ``admin``
+     - (String) The service admin user name
+   * - ``admin_user_domain`` = ``admin``
+     - (String) The admin user domain name
+   * - ``auth_url`` = ``http://127.0.0.1:5000/v2.0``
+     - (String) Authentication endpoint
+   * - ``auth_version`` = ``2``
+     - (String) The auth version used to authenticate
+   * - ``endpoint_type`` = ``public``
+     - (String) The endpoint_type to be used
+   * - ``region`` = ``RegionOne``
+     - (String) The deployment region
+   * - ``service_name`` = ``lbaas``
+     - (String) The name of the service
    * - **[signed_url]**
      -
    * - ``secret_key`` = ``None``

doc/config-reference/source/tables/zaqar-cache.rst

@@ -16,6 +16,10 @@
 
    * - Configuration option = Default value
      - Description
+   * - **[DEFAULT]**
+     -
+   * - ``memcached_servers`` = ``None``
+     - (List) Memcached servers or None for in process cache.
    * - **[cache]**
      -
    * - ``backend`` = ``dogpile.cache.null``

tools/autogenerate-config-flagmappings/aodh.flagmappings

@@ -7,12 +7,10 @@ event_alarm_cache_ttl common
 event_alarm_topic common
 executor_thread_pool_size common
 fatal_deprecations logging
-gnocchi_url common
 host common
 http_timeout common
 instance_format logging
 instance_uuid_format logging
-ipc_protocol amqp
 log_config_append logging
 log_date_format logging
 log_dir logging
@@ -23,7 +21,6 @@ logging_default_format_string logging
 logging_exception_prefix logging
 logging_user_identity_format logging
 memcached_servers common
-notifier_rpc_topic common
 notifier_topic common
 project_alarm_quota common
 publish_errors logging

tools/autogenerate-config-flagmappings/ceilometer.flagmappings

@@ -92,8 +92,6 @@ api/port api
 api/workers api
 collector/batch_size collector
 collector/batch_timeout collector
-collector/requeue_event_on_dispatcher_error collector
-collector/requeue_sample_on_dispatcher_error collector
 collector/udp_address collector
 collector/udp_port collector
 collector/workers collector

tools/autogenerate-config-flagmappings/cinder.flagmappings

@@ -169,10 +169,9 @@ glance_api_servers images
 glance_api_ssl_compression images
 glance_api_version images
 glance_ca_certificates_file images
+glance_catalog_info images
 glance_core_properties images
-glance_host images
 glance_num_retries images
-glance_port images
 glance_request_timeout images
 glusterfs_backup_mount_point storage_glusterfs
 glusterfs_backup_share storage_glusterfs

tools/autogenerate-config-flagmappings/glance.flagmappings

@@ -100,6 +100,7 @@ rpc_zmq_min_port zeromq
 rpc_zmq_topic_backlog zeromq
 scrub_pool_size imagecache
 scrub_time imagecache
+secure_proxy_ssl_header api
 send_identity_headers api
 show_image_direct_url common
 show_multiple_locations api

tools/autogenerate-config-flagmappings/ironic.flagmappings

@@ -146,6 +146,7 @@ deploy/erase_devices_iterations deploy
 deploy/erase_devices_priority deploy
 deploy/http_root deploy
 deploy/http_url deploy
+deploy/power_off_after_deploy_failure deploy
 dhcp/dhcp_provider dhcp
 disk_partitioner/check_device_interval disk_partitioner
 disk_partitioner/check_device_max_retries disk_partitioner

tools/autogenerate-config-flagmappings/manila.flagmappings

@@ -15,11 +15,7 @@ cinder_admin_auth_url generic
 cinder_admin_password generic
 cinder_admin_tenant_name generic
 cinder_admin_username generic
-cinder_api_insecure generic
-cinder_ca_certificates_file generic
 cinder_catalog_info generic
-cinder_cross_az_attach generic
-cinder_http_retries generic
 cinder_volume_type generic
 client_socket_timeout common
 compute_api_class common
@@ -167,9 +163,6 @@ nova_admin_auth_url compute
 nova_admin_password compute
 nova_admin_tenant_name compute
 nova_admin_username compute
-nova_api_insecure compute
-nova_api_microversion compute
-nova_ca_certificates_file compute
 nova_catalog_admin_info compute
 nova_catalog_info compute
 num_shell_tries common
@@ -334,6 +327,17 @@ zfssa_pool zfssa
 zfssa_project zfssa
 zfssa_rest_timeout zfssa
 zmq_target_expire zeromq
+cinder/api_insecure generic
+cinder/auth_section generic
+cinder/auth_type generic
+cinder/ca_certificates_file generic
+cinder/cafile generic
+cinder/certfile generic
+cinder/cross_az_attach generic
+cinder/http_retries generic
+cinder/insecure generic
+cinder/keyfile generic
+cinder/timeout generic
 cors/allow_credentials cors
 cors/allow_headers cors
 cors/allow_methods cors
@@ -423,6 +427,21 @@ matchmaker_redis/sentinel_group_name redis
 matchmaker_redis/sentinel_hosts redis
 matchmaker_redis/socket_timeout redis
 matchmaker_redis/wait_timeout redis
+neutron/cafile generic
+neutron/certfile generic
+neutron/insecure generic
+neutron/keyfile generic
+neutron/timeout generic
+nova/api_insecure generic
+nova/api_microversion generic
+nova/auth_section generic
+nova/auth_type generic
+nova/ca_certificates_file generic
+nova/cafile generic
+nova/certfile generic
+nova/insecure generic
+nova/keyfile generic
+nova/timeout generic
 oslo_concurrency/disable_process_locking rpc
 oslo_concurrency/lock_path rpc
 oslo_messaging_amqp/allow_insecure_clients rpc

tools/autogenerate-config-flagmappings/neutron.flagmappings

@@ -54,7 +54,6 @@ external_ingress_mark l3_agent
 external_network_bridge l3_agent
 external_pids agent
 fatal_deprecations logging
-force_gateway_on_subnet common
 force_metadata dhcp_agent
 gateway_external_network_id l3_agent
 global_physnet_mtu common

tools/autogenerate-config-flagmappings/nova.flagmappings

@@ -3,7 +3,6 @@ aggregate_image_properties_isolation_separator scheduler
 allow_instance_snapshots policy
 allow_resize_to_same_host policy
 allow_same_net_traffic network
-api_paste_config api
 api_rate_limit api
 auth_strategy authentication
 auto_assign_floating_ip network
@@ -18,7 +17,6 @@ ca_path ca
 cert ca
 cert_manager ca
 cert_topic ca
-client_socket_timeout api
 cnt_vpn_clients network
 compute_available_monitors compute
 compute_driver compute
@@ -153,7 +151,6 @@ logging_user_identity_format logging
 max_age policy
 max_concurrent_builds compute
 max_concurrent_live_migrations livemigration
-max_header_line api
 max_instances_per_host scheduler
 max_io_ops_per_host scheduler
 max_local_block_devices policy
@@ -282,7 +279,6 @@ scheduler_topic scheduler
 scheduler_tracks_instance_changes scheduler
 scheduler_use_baremetal_filters scheduler
 scheduler_weight_classes scheduler
-secure_proxy_ssl_header api
 security_group_api network
 send_arp_for_ha network
 send_arp_for_ha_count network
@@ -296,15 +292,11 @@ snapshot_name_template api
 soft_affinity_weight_multiplier scheduler
 soft_anti_affinity_weight_multiplier scheduler
 source_is_ipv6 vnc
-ssl_ca_file ca
-ssl_cert_file ca
-ssl_key_file ca
 ssl_only vnc
 state_path common
 stub_compute xen
 sync_power_state_interval compute
 syslog_log_facility logging
-tcp_keepidle api
 teardown_unused_network_gateway network
 tempdir common
 timeout_nbd hypervisor
@@ -343,9 +335,6 @@ vpn_key_suffix vpn
 vpn_start vpn
 watch_log_file logging
 web vnc
-wsgi_default_pool_size api
-wsgi_keep_alive api
-wsgi_log_format api
 zmq_target_expire zeromq
 api_database/connection database
 api_database/connection_debug database
@@ -493,6 +482,7 @@ ironic/api_endpoint ironic
 ironic/api_max_retries ironic
 ironic/api_retry_interval ironic
 ironic/api_version ironic
+ironic/cafile ironic
 ironic/client_log_level ironic
 keymgr/api_class keymgr
 keymgr/fixed_key keymgr
@@ -803,6 +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
 xenserver/agent_path xen
 xenserver/agent_resetnetwork_timeout xen
 xenserver/agent_timeout xen

tools/autogenerate-config-flagmappings/nova.headers

@@ -22,7 +22,6 @@ serial_console serial console
 spice SPICE
 trustedcomputing trusted computing
 upgrade_levels upgrade levels
-varmour vArmour
 vnc VNC
 volumes volumes
 xen Xen

tools/autogenerate-config-flagmappings/sahara.headers

@@ -1,4 +1,3 @@
 domain domain
 object_store_access Auth options for Swift access for VM
 ssh SSH
-varmour vArmour

tools/autogenerate-config-flagmappings/shared.headers

@@ -36,6 +36,7 @@ swift swift
 testing testing
 tripleo TripleO
 upgrades upgrades
+varmour vArmour
 vmware VMware
 vpn VPN
 wsgi WSGI

tools/autogenerate-config-flagmappings/trove.headers

@@ -16,5 +16,4 @@ guestagent guest agent
 heat Orchestration module
 nova nova
 taskmanager taskmanager
-varmour vArmour
 volume volume

tools/autogenerate-config-flagmappings/zaqar.flagmappings

@@ -37,6 +37,8 @@ cache/memcache_pool_unused_timeout cache
 cache/memcache_servers cache
 cache/memcache_socket_timeout cache
 cache/proxies cache
+certificates/barbican_auth api
+certificates/cert_manager_type api
 drivers/management_store drivers
 drivers/message_store drivers
 drivers/transport drivers
@@ -118,6 +120,16 @@ oslo_policy/policy_default_rule api
 oslo_policy/policy_dirs api
 oslo_policy/policy_file api
 pooling:catalog/enable_virtual_pool pooling
+service_auth/admin_password api
+service_auth/admin_project_domain api
+service_auth/admin_tenant_name api
+service_auth/admin_user api
+service_auth/admin_user_domain api
+service_auth/auth_url api
+service_auth/auth_version api
+service_auth/endpoint_type api
+service_auth/region api
+service_auth/service_name api
 signed_url/secret_key api
 storage/claim_pipeline storage
 storage/message_pipeline storage
@@ -137,3 +149,7 @@ transport/max_queue_metadata transport
 transport/max_queues_per_page transport
 transport/max_subscriptions_per_page transport
 transport/subscriber_types transport
+vArmour/director varmour
+vArmour/director_port varmour
+vArmour/password varmour
+vArmour/username varmour