Merge "[config-ref] update ironic config options for Ocata"

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

@@ -18,12 +18,12 @@
      - Description
    * - **[audit]**
      -
-   * - ``audit_map_file`` = ``/etc/ironic/ironic_api_audit_map.conf``
+   * - ``audit_map_file`` = ``/etc/ironic/api_audit_map.conf``
      - (String) Path to audit map file for ironic-api service. Used only when API audit is enabled.
    * - ``enabled`` = ``False``
      - (Boolean) Enable auditing of API requests (for ironic-api service).
-   * - ``ignore_req_list`` = ``None``
-     - (String) Comma separated list of Ironic REST API HTTP methods to be ignored during audit. For example: auditing will not be done on any GET or POST requests if this is set to "GET,POST". It is used only when API audit is enabled.
+   * - ``ignore_req_list`` =
+     - (String) Comma separated list of Ironic REST API HTTP methods to be ignored during audit logging. For example: auditing will not be done on any GET or POST requests if this is set to "GET,POST". It is used only when API audit is enabled.
    * - ``namespace`` = ``openstack``
      - (String) namespace prefix for generated id
    * - **[audit_middleware_notifications]**

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

@@ -22,12 +22,52 @@
      - (String) Directory where ironic binaries are installed.
    * - ``debug_tracebacks_in_api`` = ``False``
      - (Boolean) Return server tracebacks in the API response for any error responses. WARNING: this is insecure and should not be used in a production environment.
+   * - ``default_boot_interface`` = ``None``
+     - (String) Default boot interface to be used for nodes that do not have boot_interface field set. A complete list of boot interfaces present on your system may be found by enumerating the "ironic.hardware.interfaces.boot" entrypoint.
+   * - ``default_console_interface`` = ``None``
+     - (String) Default console interface to be used for nodes that do not have console_interface field set. A complete list of console interfaces present on your system may be found by enumerating the "ironic.hardware.interfaces.console" entrypoint.
+   * - ``default_deploy_interface`` = ``None``
+     - (String) Default deploy interface to be used for nodes that do not have deploy_interface field set. A complete list of deploy interfaces present on your system may be found by enumerating the "ironic.hardware.interfaces.deploy" entrypoint.
+   * - ``default_inspect_interface`` = ``None``
+     - (String) Default inspect interface to be used for nodes that do not have inspect_interface field set. A complete list of inspect interfaces present on your system may be found by enumerating the "ironic.hardware.interfaces.inspect" entrypoint.
+   * - ``default_management_interface`` = ``None``
+     - (String) Default management interface to be used for nodes that do not have management_interface field set. A complete list of management interfaces present on your system may be found by enumerating the "ironic.hardware.interfaces.management" entrypoint.
    * - ``default_network_interface`` = ``None``
      - (String) Default network interface to be used for nodes that do not have network_interface field set. A complete list of network interfaces present on your system may be found by enumerating the "ironic.hardware.interfaces.network" entrypoint.
+   * - ``default_portgroup_mode`` = ``active-backup``
+     - (String) Default mode for portgroups. Allowed values can be found in the linux kernel documentation on bonding: https://www.kernel.org/doc/Documentation/networking/bonding.txt.
+   * - ``default_power_interface`` = ``None``
+     - (String) Default power interface to be used for nodes that do not have power_interface field set. A complete list of power interfaces present on your system may be found by enumerating the "ironic.hardware.interfaces.power" entrypoint.
+   * - ``default_raid_interface`` = ``None``
+     - (String) Default raid interface to be used for nodes that do not have raid_interface field set. A complete list of raid interfaces present on your system may be found by enumerating the "ironic.hardware.interfaces.raid" entrypoint.
+   * - ``default_storage_interface`` = ``None``
+     - (List) Default storage interface to be used for nodes that do not have storage_interface field set. A complete list of storage interfaces present on your system may be found by enumerating the "ironic.hardware.interfaces.storage" entrypoint.
+   * - ``default_vendor_interface`` = ``None``
+     - (String) Default vendor interface to be used for nodes that do not have vendor_interface field set. A complete list of vendor interfaces present on your system may be found by enumerating the "ironic.hardware.interfaces.vendor" entrypoint.
+   * - ``enabled_boot_interfaces`` = ``pxe``
+     - (List) Specify the list of boot interfaces to load during service initialization. Missing boot interfaces, or boot interfaces which fail to initialize, will prevent the ironic-conductor service from starting. At least one boot interface that is supported by each enabled hardware type must be enabled here, or the ironic-conductor service will not start. Must not be an empty list. The default value is a recommended set of production-oriented boot interfaces. A complete list of boot interfaces present on your system may be found by enumerating the "ironic.hardware.interfaces.boot" entrypoint. When setting this value, please make sure that every enabled hardware type will have the same set of enabled boot interfaces on every ironic-conductor service.
+   * - ``enabled_console_interfaces`` = ``no-console``
+     - (List) Specify the list of console interfaces to load during service initialization. Missing console interfaces, or console interfaces which fail to initialize, will prevent the ironic-conductor service from starting. At least one console interface that is supported by each enabled hardware type must be enabled here, or the ironic-conductor service will not start. Must not be an empty list. The default value is a recommended set of production-oriented console interfaces. A complete list of console interfaces present on your system may be found by enumerating the "ironic.hardware.interfaces.console" entrypoint. When setting this value, please make sure that every enabled hardware type will have the same set of enabled console interfaces on every ironic-conductor service.
+   * - ``enabled_deploy_interfaces`` = ``iscsi, direct``
+     - (List) Specify the list of deploy interfaces to load during service initialization. Missing deploy interfaces, or deploy interfaces which fail to initialize, will prevent the ironic-conductor service from starting. At least one deploy interface that is supported by each enabled hardware type must be enabled here, or the ironic-conductor service will not start. Must not be an empty list. The default value is a recommended set of production-oriented deploy interfaces. A complete list of deploy interfaces present on your system may be found by enumerating the "ironic.hardware.interfaces.deploy" entrypoint. When setting this value, please make sure that every enabled hardware type will have the same set of enabled deploy interfaces on every ironic-conductor service.
    * - ``enabled_drivers`` = ``pxe_ipmitool``
      - (List) Specify the list of drivers to load during service initialization. Missing drivers, or drivers which fail to initialize, will prevent the conductor service from starting. The option default is a recommended set of production-oriented drivers. A complete list of drivers present on your system may be found by enumerating the "ironic.drivers" entrypoint. An example may be found in the developer documentation online.
+   * - ``enabled_hardware_types`` = ``ipmi``
+     - (List) Specify the list of hardware types to load during service initialization. Missing hardware types, or hardware types which fail to initialize, will prevent the conductor service from starting. This option defaults to a recommended set of production-oriented hardware types. A complete list of hardware types present on your system may be found by enumerating the "ironic.hardware.types" entrypoint.
+   * - ``enabled_inspect_interfaces`` = ``no-inspect``
+     - (List) Specify the list of inspect interfaces to load during service initialization. Missing inspect interfaces, or inspect interfaces which fail to initialize, will prevent the ironic-conductor service from starting. At least one inspect interface that is supported by each enabled hardware type must be enabled here, or the ironic-conductor service will not start. Must not be an empty list. The default value is a recommended set of production-oriented inspect interfaces. A complete list of inspect interfaces present on your system may be found by enumerating the "ironic.hardware.interfaces.inspect" entrypoint. When setting this value, please make sure that every enabled hardware type will have the same set of enabled inspect interfaces on every ironic-conductor service.
+   * - ``enabled_management_interfaces`` = ``ipmitool``
+     - (List) Specify the list of management interfaces to load during service initialization. Missing management interfaces, or management interfaces which fail to initialize, will prevent the ironic-conductor service from starting. At least one management interface that is supported by each enabled hardware type must be enabled here, or the ironic-conductor service will not start. Must not be an empty list. The default value is a recommended set of production-oriented management interfaces. A complete list of management interfaces present on your system may be found by enumerating the "ironic.hardware.interfaces.management" entrypoint. When setting this value, please make sure that every enabled hardware type will have the same set of enabled management interfaces on every ironic-conductor service.
    * - ``enabled_network_interfaces`` = ``flat, noop``
-     - (List) Specify the list of network interfaces to load during service initialization. Missing network interfaces, or network interfaces which fail to initialize, will prevent the conductor service from starting. The option default is a recommended set of production-oriented network interfaces. A complete list of network interfaces present on your system may be found by enumerating the "ironic.hardware.interfaces.network" entrypoint. This value must be the same on all ironic-conductor and ironic-api services, because it is used by ironic-api service to validate a new or updated node's network_interface value.
+     - (List) Specify the list of network interfaces to load during service initialization. Missing network interfaces, or network interfaces which fail to initialize, will prevent the ironic-conductor service from starting. At least one network interface that is supported by each enabled hardware type must be enabled here, or the ironic-conductor service will not start. Must not be an empty list. The default value is a recommended set of production-oriented network interfaces. A complete list of network interfaces present on your system may be found by enumerating the "ironic.hardware.interfaces.network" entrypoint. When setting this value, please make sure that every enabled hardware type will have the same set of enabled network interfaces on every ironic-conductor service.
+   * - ``enabled_power_interfaces`` = ``ipmitool``
+     - (List) Specify the list of power interfaces to load during service initialization. Missing power interfaces, or power interfaces which fail to initialize, will prevent the ironic-conductor service from starting. At least one power interface that is supported by each enabled hardware type must be enabled here, or the ironic-conductor service will not start. Must not be an empty list. The default value is a recommended set of production-oriented power interfaces. A complete list of power interfaces present on your system may be found by enumerating the "ironic.hardware.interfaces.power" entrypoint. When setting this value, please make sure that every enabled hardware type will have the same set of enabled power interfaces on every ironic-conductor service.
+   * - ``enabled_raid_interfaces`` = ``agent, no-raid``
+     - (List) Specify the list of raid interfaces to load during service initialization. Missing raid interfaces, or raid interfaces which fail to initialize, will prevent the ironic-conductor service from starting. At least one raid interface that is supported by each enabled hardware type must be enabled here, or the ironic-conductor service will not start. Must not be an empty list. The default value is a recommended set of production-oriented raid interfaces. A complete list of raid interfaces present on your system may be found by enumerating the "ironic.hardware.interfaces.raid" entrypoint. When setting this value, please make sure that every enabled hardware type will have the same set of enabled raid interfaces on every ironic-conductor service.
+   * - ``enabled_storage_interfaces`` = ``noop``
+     - (List) Specify the list of storage interfaces to load during service initialization. Missing storage interfaces, or storage interfaces which fail to initialize, will prevent the ironic-conductor service from starting. At least one storage interface that is supported by each enabled hardware type must be enabled here, or the ironic-conductor service will not start. Must not be an empty list. The default value is a recommended set of production-oriented storage interfaces. A complete list of storage interfaces present on your system may be found by enumerating the "ironic.hardware.interfaces.storage" entrypoint. When setting this value, please make sure that every enabled hardware type will have the same set of enabled storage interfaces on every ironic-conductor service.
+   * - ``enabled_vendor_interfaces`` = ``no-vendor``
+     - (List) Specify the list of vendor interfaces to load during service initialization. Missing vendor interfaces, or vendor interfaces which fail to initialize, will prevent the ironic-conductor service from starting. At least one vendor interface that is supported by each enabled hardware type must be enabled here, or the ironic-conductor service will not start. Must not be an empty list. The default value is a recommended set of production-oriented vendor interfaces. A complete list of vendor interfaces present on your system may be found by enumerating the "ironic.hardware.interfaces.vendor" entrypoint. When setting this value, please make sure that every enabled hardware type will have the same set of enabled vendor interfaces on every ironic-conductor service.
    * - ``executor_thread_pool_size`` = ``64``
      - (Integer) Size of executor thread pool.
    * - ``fatal_exception_format_errors`` = ``False``
@@ -39,7 +79,7 @@
    * - ``hash_distribution_replicas`` = ``1``
      - (Integer) [Experimental Feature] Number of hosts to map onto each hash partition. Setting this to more than one will cause additional conductor services to prepare deployment environments and potentially allow the Ironic cluster to recover more quickly if a conductor instance is terminated.
    * - ``hash_partition_exponent`` = ``5``
-     - (Integer) Exponent to determine number of hash partitions to use when distributing load across conductors. Larger values will result in more even distribution of load and less load when rebalancing the ring, but more memory usage. Number of partitions per conductor is (2^hash_partition_exponent). This determines the granularity of rebalancing: given 10 hosts, and an exponent of the 2, there are 40 partitions in the ring.A few thousand partitions should make rebalancing smooth in most cases. The default is suitable for up to a few hundred conductors. Too many partitions has a CPU impact.
+     - (Integer) Exponent to determine number of hash partitions to use when distributing load across conductors. Larger values will result in more even distribution of load and less load when rebalancing the ring, but more memory usage. Number of partitions per conductor is (2^hash_partition_exponent). This determines the granularity of rebalancing: given 10 hosts, and an exponent of the 2, there are 40 partitions in the ring.A few thousand partitions should make rebalancing smooth in most cases. The default is suitable for up to a few hundred conductors. Configuring for too many partitions has a negative impact on CPU usage.
    * - ``hash_ring_reset_interval`` = ``180``
      - (Integer) Interval (in seconds) between hash ring resets.
    * - ``host`` = ``localhost``
@@ -62,6 +102,18 @@
      - (String) Top-level directory for maintaining ironic's state.
    * - ``tempdir`` = ``/tmp``
      - (String) Temporary working directory, default is Python temp dir.
+   * - **[healthcheck]**
+     -
+   * - ``backends`` =
+     - (List) Additional backends that can perform health checks and report that information back as part of a request.
+   * - ``detailed`` = ``False``
+     - (Boolean) Show more detailed information as part of the response
+   * - ``disable_by_file_path`` = ``None``
+     - (String) Check the presence of a file to determine if an application is running on a port. Used by DisableByFileHealthcheck plugin.
+   * - ``disable_by_file_paths`` =
+     - (List) Check the presence of a file based on a port to determine if an application is running on a port. Expects a "port:path" list of strings. Used by DisableByFilesPortsHealthcheck plugin.
+   * - ``path`` = ``/healthcheck``
+     - (String) DEPRECATED: The path to respond to healtcheck requests on.
    * - **[ironic_lib]**
      -
    * - ``fatal_exception_format_errors`` = ``False``

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

@@ -19,7 +19,7 @@
    * - **[conductor]**
      -
    * - ``api_url`` = ``None``
-     - (String) URL of Ironic API service. If not set ironic can get the current value from the keystone service catalog.
+     - (String) URL of Ironic API service. If not set ironic can get the current value from the keystone service catalog. If set, the value must start with either http:// or https://.
    * - ``automated_clean`` = ``True``
      - (Boolean) Enables or disables automated cleaning. Automated cleaning is a configurable set of steps, such as erasing disk drives, that are performed on the node to ensure it is in a baseline state and ready to be deployed to. This is done after instance deletion as well as during the transition from a "manageable" to "available" state. When enabled, the particular steps performed to clean a node depend on which driver that node is managed by; see the individual driver's documentation for details. NOTE: The introduction of the cleaning operation causes instance deletion to take significantly longer. In an environment where all tenants are trusted (eg, because there is only one tenant), this option could be safely disabled.
    * - ``check_provision_state_interval`` = ``60``
@@ -54,6 +54,12 @@
      - (Integer) Seconds between conductor sending sensor data message to ceilometer via the notification bus.
    * - ``send_sensor_data_types`` = ``ALL``
      - (List) List of comma separated meter types which need to be sent to Ceilometer. The default value, "ALL", is a special value meaning send all the sensor data.
+   * - ``send_sensor_data_wait_timeout`` = ``300``
+     - (Integer) The time in seconds to wait for send sensors data periodic task to be finished before allowing periodic call to happen again. Should be less than send_sensor_data_interval value.
+   * - ``send_sensor_data_workers`` = ``4``
+     - (Integer) The maximum number of workers that can be started simultaneously for send data from sensors periodic task.
+   * - ``soft_power_off_timeout`` = ``600``
+     - (Integer) Timeout (in seconds) of soft reboot and soft power off operation. This value always has to be positive.
    * - ``sync_local_state_interval`` = ``180``
      - (Integer) When conductors join or leave the cluster, existing conductors may need to update any persistent local state as nodes are moved around the cluster. This option controls how often, in seconds, each conductor will check for nodes that it should "take over". Set it to a negative value to disable the check entirely.
    * - ``sync_power_state_interval`` = ``60``

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

@@ -20,6 +20,8 @@
      -
    * - ``continue_if_disk_secure_erase_fails`` = ``False``
      - (Boolean) Defines what to do if an ATA secure erase operation fails during cleaning in the Ironic Python Agent. If False, the cleaning operation will fail and the node will be put in ``clean failed`` state. If True, shred will be invoked and cleaning will continue.
+   * - ``default_boot_option`` = ``None``
+     - (String) Default boot option to use when no boot option is requested in node's driver_info. Currently the default is "netboot", but it will be changed to "local" in the future. It is recommended to set an explicit value for this option.
    * - ``erase_devices_metadata_priority`` = ``None``
      - (Integer) Priority to run in-band clean step that erases metadata from devices, via the Ironic Python Agent ramdisk. If unset, will use the priority set in the ramdisk (defaults to 99 for the GenericHardwareManager). If set to 0, will not run during cleaning.
    * - ``erase_devices_priority`` = ``None``

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

@@ -34,6 +34,8 @@
      - (Boolean) Allow to perform insecure SSL (https) requests to glance.
    * - ``glance_api_servers`` = ``None``
      - (List) A list of the glance api servers available to ironic. Prefix with https:// for SSL-based glance API servers. Format is [hostname|IP]:port.
+   * - ``glance_api_version`` = ``2``
+     - (Integer) Glance API version (1 or 2) to use.
    * - ``glance_cafile`` = ``None``
      - (String) Optional path to a CA certificate bundle to be used to validate the SSL certificate served by glance. It is used when glance_api_insecure is set to False.
    * - ``glance_host`` = ``$my_ip``

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

@@ -27,7 +27,7 @@
    * - ``certfile`` = ``None``
      - (String) PEM encoded client certificate cert file
    * - ``enabled`` = ``False``
-     - (Boolean) whether to enable inspection using ironic-inspector
+     - (Boolean) whether to enable inspection using ironic-inspector. This option does not affect new-style dynamic drivers and the fake_inspector driver.
    * - ``insecure`` = ``False``
      - (Boolean) Verify HTTPS connections.
    * - ``keyfile`` = ``None``

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

@@ -42,6 +42,8 @@
      - (String) Sensor data retrieval method.
    * - ``snmp_community`` = ``public``
      - (String) SNMP community. Required for versions "v1" and "v2c"
+   * - ``snmp_polling_interval`` = ``10``
+     - (Integer) SNMP polling interval in seconds
    * - ``snmp_port`` = ``161``
      - (Port number) SNMP port
    * - ``snmp_security`` = ``None``

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

@@ -28,16 +28,20 @@
      - (String) PEM encoded Certificate Authority to use when verifying HTTPs connections.
    * - ``certfile`` = ``None``
      - (String) PEM encoded client certificate cert file
-   * - ``cleaning_network_uuid`` = ``None``
-     - (String) Neutron network UUID for the ramdisk to be booted into for cleaning nodes. Required for "neutron" network interface. It is also required if cleaning nodes when using "flat" network interface or "neutron" DHCP provider.
+   * - ``cleaning_network`` = ``None``
+     - (String) Neutron network UUID or name for the ramdisk to be booted into for cleaning nodes. Required for "neutron" network interface. It is also required if cleaning nodes when using "flat" network interface or "neutron" DHCP provider. If a name is provided, it must be unique among all networks or cleaning will fail.
+   * - ``cleaning_network_security_groups`` =
+     - (List) List of Neutron Security Group UUIDs to be applied during cleaning of the nodes. Optional for the "neutron" network interface and not used for the "flat" or "noop" network interfaces. If not specified, default security group is used.
    * - ``insecure`` = ``False``
      - (Boolean) Verify HTTPS connections.
    * - ``keyfile`` = ``None``
      - (String) PEM encoded client certificate key file
    * - ``port_setup_delay`` = ``0``
      - (Integer) Delay value to wait for Neutron agents to setup sufficient DHCP configuration for port.
-   * - ``provisioning_network_uuid`` = ``None``
-     - (String) Neutron network UUID for the ramdisk to be booted into for provisioning nodes. Required for "neutron" network interface.
+   * - ``provisioning_network`` = ``None``
+     - (String) Neutron network UUID or name for the ramdisk to be booted into for provisioning nodes. Required for "neutron" network interface. If a name is provided, it must be unique among all networks or deploy will fail.
+   * - ``provisioning_network_security_groups`` =
+     - (List) List of Neutron Security Group UUIDs to be applied during provisioning of the nodes. Optional for the "neutron" network interface and not used for the "flat" or "noop" network interfaces. If not specified, default security group is used.
    * - ``retries`` = ``3``
      - (Integer) Client retries in the case of a failed request.
    * - ``timeout`` = ``None``

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

@@ -42,8 +42,12 @@
      - (String) Additional append parameters for baremetal PXE boot.
    * - ``pxe_bootfile_name`` = ``pxelinux.0``
      - (String) Bootfile DHCP parameter.
+   * - ``pxe_bootfile_name_by_arch`` = ``{}``
+     - (Dict) Bootfile DHCP parameter per node architecture. For example: aarch64:grubaa64.efi
    * - ``pxe_config_template`` = ``$pybasedir/drivers/modules/pxe_config.template``
      - (String) On ironic-conductor node, template file for PXE configuration.
+   * - ``pxe_config_template_by_arch`` = ``{}``
+     - (Dict) On ironic-conductor node, template file for PXE configuration per node architecture. For example: aarch64:/opt/share/grubaa64_pxe_config.template
    * - ``tftp_master_path`` = ``/tftpboot/master_images``
      - (String) On ironic-conductor node, directory where master TFTP images are stored on disk. Setting to <None> disables image caching.
    * - ``tftp_root`` = ``/tftpboot``

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

@@ -29,8 +29,8 @@
    * - ``sentinel_group_name`` = ``oslo-messaging-zeromq``
      - (String) Redis replica set name.
    * - ``sentinel_hosts`` =
-     - (List) DEPRECATED: List of Redis Sentinel hosts (fault tolerance mode) e.g. [host:port, host1:port ... ] Replaced by [DEFAULT]/transport_url
+     - (List) DEPRECATED: List of Redis Sentinel hosts (fault tolerance mode), e.g., [host:port, host1:port ... ] Replaced by [DEFAULT]/transport_url
    * - ``socket_timeout`` = ``10000``
-     - (Integer) Timeout in ms on blocking socket operations
+     - (Integer) Timeout in ms on blocking socket operations.
    * - ``wait_timeout`` = ``2000``
      - (Integer) Time in ms to wait between connection attempts.

tools/autogenerate-config-flagmappings/ironic.flagmappings

@@ -5,10 +5,30 @@ conn_pool_ttl disable
 control_exchange disable
 debug disable
 debug_tracebacks_in_api common
+default_boot_interface common
+default_console_interface common
+default_deploy_interface common
+default_inspect_interface common
 default_log_levels disable
+default_management_interface common
 default_network_interface common
+default_portgroup_mode common
+default_power_interface common
+default_raid_interface common
+default_storage_interface common
+default_vendor_interface common
+enabled_boot_interfaces common
+enabled_console_interfaces common
+enabled_deploy_interfaces common
 enabled_drivers common
+enabled_hardware_types common
+enabled_inspect_interfaces common
+enabled_management_interfaces common
 enabled_network_interfaces common
+enabled_power_interfaces common
+enabled_raid_interfaces common
+enabled_storage_interfaces common
+enabled_vendor_interfaces common
 executor_thread_pool_size common
 fatal_deprecations disable
 fatal_exception_format_errors common
@@ -37,12 +57,20 @@ parallel_image_downloads common
 pecan_debug debug
 publish_errors disable
 pybasedir common
+rate_limit_burst disable
+rate_limit_except_level disable
+rate_limit_interval disable
 rootwrap_config common
+rpc_ack_timeout_base disable
+rpc_ack_timeout_multiplier disable
 rpc_backend disable
-rpc_cast_timeout disable
 rpc_conn_pool_size disable
+rpc_message_ttl disable
 rpc_poll_timeout disable
 rpc_response_timeout disable
+rpc_retry_attempts disable
+rpc_thread_pool_size disable
+rpc_use_acks disable
 rpc_zmq_bind_address disable
 rpc_zmq_bind_port_retries disable
 rpc_zmq_contexts disable
@@ -54,18 +82,26 @@ rpc_zmq_min_port disable
 rpc_zmq_serialization disable
 rpc_zmq_topic_backlog disable
 state_path common
+subscribe_on disable
 syslog_log_facility disable
 tempdir common
 transport_url disable
+use_dynamic_connections disable
 use_pub_sub disable
 use_router_proxy disable
 use_stderr disable
 use_syslog disable
 verbose disable
 watch_log_file disable
+zmq_failover_connections disable
 zmq_immediate disable
+zmq_linger disable
 zmq_target_expire disable
 zmq_target_update disable
+zmq_tcp_keepalive disable
+zmq_tcp_keepalive_cnt disable
+zmq_tcp_keepalive_idle disable
+zmq_tcp_keepalive_intvl disable
 agent/agent_api_version agent
 agent/deploy_logs_collect agent
 agent/deploy_logs_local_path agent
@@ -77,10 +113,6 @@ agent/memory_consumed_by_agent agent
 agent/post_deploy_get_power_state_retries agent
 agent/post_deploy_get_power_state_retry_interval agent
 agent/stream_raw_images agent
-amt/action_wait amt
-amt/awake_interval amt
-amt/max_attempts amt
-amt/protocol amt
 api/api_workers api
 api/enable_ssl_api api
 api/host_ip api
@@ -118,6 +150,9 @@ conductor/power_state_sync_max_retries conductor
 conductor/send_sensor_data conductor
 conductor/send_sensor_data_interval conductor
 conductor/send_sensor_data_types conductor
+conductor/send_sensor_data_wait_timeout conductor
+conductor/send_sensor_data_workers conductor
+conductor/soft_power_off_timeout conductor
 conductor/sync_local_state_interval conductor
 conductor/sync_power_state_interval conductor
 conductor/workers_pool_size conductor
@@ -160,6 +195,7 @@ database/sqlite_db disable
 database/sqlite_synchronous disable
 database/use_db_reconnect disable
 deploy/continue_if_disk_secure_erase_fails deploy
+deploy/default_boot_option deploy
 deploy/erase_devices_metadata_priority deploy
 deploy/erase_devices_priority deploy
 deploy/http_root deploy
@@ -183,6 +219,7 @@ glance/cafile glance
 glance/certfile glance
 glance/glance_api_insecure glance
 glance/glance_api_servers glance
+glance/glance_api_version glance
 glance/glance_cafile glance
 glance/glance_host glance
 glance/glance_num_retries glance
@@ -201,9 +238,11 @@ glance/swift_temp_url_expected_download_start_delay glance
 glance/swift_temp_url_key glance
 glance/temp_url_endpoint_type glance
 glance/timeout glance
-iboot/max_retry iboot
-iboot/reboot_delay iboot
-iboot/retry_interval iboot
+healthcheck/backends common
+healthcheck/detailed common
+healthcheck/disable_by_file_path common
+healthcheck/disable_by_file_paths common
+healthcheck/path common
 ilo/ca_file ilo
 ilo/clean_priority_clear_secure_boot_keys ilo
 ilo/clean_priority_erase_devices ilo
@@ -243,6 +282,7 @@ irmc/remote_image_user_name irmc
 irmc/remote_image_user_password irmc
 irmc/sensor_method irmc
 irmc/snmp_community irmc
+irmc/snmp_polling_interval irmc
 irmc/snmp_port irmc
 irmc/snmp_security irmc
 irmc/snmp_version irmc
@@ -286,6 +326,8 @@ keystone_authtoken/memcache_use_advanced_pool disable
 keystone_authtoken/memcached_servers disable
 keystone_authtoken/region_name disable
 keystone_authtoken/revocation_cache_time disable
+keystone_authtoken/service_token_roles disable
+keystone_authtoken/service_token_roles_required disable
 keystone_authtoken/signing_dir disable
 keystone_authtoken/token_cache_time disable
 matchmaker_redis/check_timeout redis
@@ -314,11 +356,13 @@ neutron/auth_strategy neutron
 neutron/auth_type neutron
 neutron/cafile neutron
 neutron/certfile neutron
-neutron/cleaning_network_uuid neutron
+neutron/cleaning_network neutron
+neutron/cleaning_network_security_groups neutron
 neutron/insecure neutron
 neutron/keyfile neutron
 neutron/port_setup_delay neutron
-neutron/provisioning_network_uuid neutron
+neutron/provisioning_network neutron
+neutron/provisioning_network_security_groups neutron
 neutron/retries neutron
 neutron/timeout neutron
 neutron/url neutron
@@ -343,9 +387,11 @@ oslo_messaging_amqp/connection_retry_interval_max disable
 oslo_messaging_amqp/container_name disable
 oslo_messaging_amqp/default_notification_exchange disable
 oslo_messaging_amqp/default_notify_timeout disable
+oslo_messaging_amqp/default_reply_retry disable
 oslo_messaging_amqp/default_reply_timeout disable
 oslo_messaging_amqp/default_rpc_exchange disable
 oslo_messaging_amqp/default_send_timeout disable
+oslo_messaging_amqp/default_sender_link_timeout disable
 oslo_messaging_amqp/group_request_prefix disable
 oslo_messaging_amqp/idle_timeout disable
 oslo_messaging_amqp/link_retry_delay disable
@@ -353,6 +399,7 @@ oslo_messaging_amqp/multicast_address disable
 oslo_messaging_amqp/notify_address_prefix disable
 oslo_messaging_amqp/notify_server_credit disable
 oslo_messaging_amqp/password disable
+oslo_messaging_amqp/pre_settled disable
 oslo_messaging_amqp/reply_link_credit disable
 oslo_messaging_amqp/rpc_address_prefix disable
 oslo_messaging_amqp/rpc_server_credit disable
@@ -367,6 +414,16 @@ oslo_messaging_amqp/ssl_key_password disable
 oslo_messaging_amqp/trace disable
 oslo_messaging_amqp/unicast_address disable
 oslo_messaging_amqp/username disable
+oslo_messaging_kafka/conn_pool_min_size disable
+oslo_messaging_kafka/conn_pool_ttl disable
+oslo_messaging_kafka/consumer_group disable
+oslo_messaging_kafka/kafka_consumer_timeout disable
+oslo_messaging_kafka/kafka_default_host disable
+oslo_messaging_kafka/kafka_default_port disable
+oslo_messaging_kafka/kafka_max_fetch_bytes disable
+oslo_messaging_kafka/pool_size disable
+oslo_messaging_kafka/producer_batch_size disable
+oslo_messaging_kafka/producer_batch_timeout disable
 oslo_messaging_notifications/driver disable
 oslo_messaging_notifications/topics disable
 oslo_messaging_notifications/transport_url disable
@@ -378,6 +435,7 @@ oslo_messaging_rabbit/default_notification_exchange disable
 oslo_messaging_rabbit/default_notification_retry_attempts disable
 oslo_messaging_rabbit/default_rpc_exchange disable
 oslo_messaging_rabbit/default_rpc_retry_attempts disable
+oslo_messaging_rabbit/default_serializer_type disable
 oslo_messaging_rabbit/fake_rabbit disable
 oslo_messaging_rabbit/frame_max disable
 oslo_messaging_rabbit/heartbeat_interval disable
@@ -426,8 +484,13 @@ oslo_messaging_rabbit/socket_timeout disable
 oslo_messaging_rabbit/ssl disable
 oslo_messaging_rabbit/ssl_options disable
 oslo_messaging_rabbit/tcp_user_timeout disable
-oslo_messaging_zmq/rpc_cast_timeout disable
+oslo_messaging_zmq/rpc_ack_timeout_base disable
+oslo_messaging_zmq/rpc_ack_timeout_multiplier disable
+oslo_messaging_zmq/rpc_message_ttl disable
 oslo_messaging_zmq/rpc_poll_timeout disable
+oslo_messaging_zmq/rpc_retry_attempts disable
+oslo_messaging_zmq/rpc_thread_pool_size disable
+oslo_messaging_zmq/rpc_use_acks disable
 oslo_messaging_zmq/rpc_zmq_bind_address disable
 oslo_messaging_zmq/rpc_zmq_bind_port_retries disable
 oslo_messaging_zmq/rpc_zmq_contexts disable
@@ -438,11 +501,19 @@ oslo_messaging_zmq/rpc_zmq_max_port disable
 oslo_messaging_zmq/rpc_zmq_min_port disable
 oslo_messaging_zmq/rpc_zmq_serialization disable
 oslo_messaging_zmq/rpc_zmq_topic_backlog disable
+oslo_messaging_zmq/subscribe_on disable
+oslo_messaging_zmq/use_dynamic_connections disable
 oslo_messaging_zmq/use_pub_sub disable
 oslo_messaging_zmq/use_router_proxy disable
+oslo_messaging_zmq/zmq_failover_connections disable
 oslo_messaging_zmq/zmq_immediate disable
+oslo_messaging_zmq/zmq_linger disable
 oslo_messaging_zmq/zmq_target_expire disable
 oslo_messaging_zmq/zmq_target_update disable
+oslo_messaging_zmq/zmq_tcp_keepalive disable
+oslo_messaging_zmq/zmq_tcp_keepalive_cnt disable
+oslo_messaging_zmq/zmq_tcp_keepalive_idle disable
+oslo_messaging_zmq/zmq_tcp_keepalive_intvl disable
 oslo_middleware/enable_proxy_headers_parsing api
 oslo_middleware/max_request_body_size api
 oslo_middleware/secure_proxy_ssl_header api
@@ -462,14 +533,14 @@ pxe/ipxe_timeout pxe
 pxe/ipxe_use_swift pxe
 pxe/pxe_append_params pxe
 pxe/pxe_bootfile_name pxe
+pxe/pxe_bootfile_name_by_arch pxe
 pxe/pxe_config_template pxe
+pxe/pxe_config_template_by_arch pxe
 pxe/tftp_master_path pxe
 pxe/tftp_root pxe
 pxe/tftp_server pxe
 pxe/uefi_pxe_bootfile_name pxe
 pxe/uefi_pxe_config_template pxe
-seamicro/action_timeout seamicro
-seamicro/max_retry seamicro
 service_catalog/auth_section service_catalog
 service_catalog/auth_type service_catalog
 service_catalog/cafile service_catalog
@@ -490,4 +561,3 @@ swift/insecure swift
 swift/keyfile swift
 swift/swift_max_retries swift
 swift/timeout swift
-virtualbox/port virtualbox