diff --git a/doc/common/tables/ironic-agent.xml b/doc/common/tables/ironic-agent.xml index 3d329dcd89..460c44c5b8 100644 --- a/doc/common/tables/ironic-agent.xml +++ b/doc/common/tables/ironic-agent.xml @@ -18,23 +18,23 @@ [agent] - agent_api_version = v1 + = v1 (StrOpt) API version to use for communicating with the ramdisk agent. - agent_pxe_append_params = nofb nomodeset vga=normal + = nofb nomodeset vga=normal (StrOpt) Additional append parameters for baremetal PXE boot. - agent_pxe_bootfile_name = pxelinux.0 + = pxelinux.0 (StrOpt) Neutron bootfile DHCP parameter. - agent_pxe_config_template = $pybasedir/drivers/modules/agent_config.template + = $pybasedir/drivers/modules/agent_config.template (StrOpt) Template file for PXE configuration. - heartbeat_timeout = 300 + = 300 (IntOpt) Maximum interval (in seconds) for agent heartbeats. diff --git a/doc/common/tables/ironic-amt.xml b/doc/common/tables/ironic-amt.xml new file mode 100644 index 0000000000..38935d1863 --- /dev/null +++ b/doc/common/tables/ironic-amt.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + +
Description of amt configuration options
Configuration option = Default valueDescription
[amt]
= http(StrOpt) Protocol used for AMT endpoint, support http/https
+
diff --git a/doc/common/tables/ironic-api.xml b/doc/common/tables/ironic-api.xml index ce8a74a555..99cec95d26 100644 --- a/doc/common/tables/ironic-api.xml +++ b/doc/common/tables/ironic-api.xml @@ -14,25 +14,6 @@ - - [DEFAULT] - - - = api-paste.ini - (StrOpt) File name for the paste.deploy config for nova-api - - - = False - (BoolOpt) Whether to use per-user rate limiting for the api. This option is only used by v2 api. Rate limiting is removed from v3 api. - - - = 900 - (IntOpt) 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. - - - = False - (BoolOpt) Treat X-Forwarded-For as the canonical remote address. Only enable this if you have a sanitizing proxy. - [api] diff --git a/doc/common/tables/ironic-auth.xml b/doc/common/tables/ironic-auth.xml index dce873ad2a..6909295336 100644 --- a/doc/common/tables/ironic-auth.xml +++ b/doc/common/tables/ironic-auth.xml @@ -19,7 +19,7 @@ = keystone - (StrOpt) The strategy to use for auth: noauth or keystone. + (StrOpt) Method to use for authentication: noauth or keystone. diff --git a/doc/common/tables/ironic-cells.xml b/doc/common/tables/ironic-cells.xml new file mode 100644 index 0000000000..8a7e0cc378 --- /dev/null +++ b/doc/common/tables/ironic-cells.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of cells configuration options
Configuration option = Default valueDescription
[cells]
= 600(IntOpt) Seconds between bandwidth updates for cells.
= 60(IntOpt) Seconds to wait for response from a call to a cell.
= hypervisor=xenserver;kvm, os=linux;windows(ListOpt) Key/Multi-value list with the capabilities of the cell
= compute(StrOpt) Type of cell: api or compute
= False(BoolOpt) Enable cell functionality
= nova.cells.manager.CellsManager(StrOpt) Manager for cells
= 300(IntOpt) Number of seconds after which a lack of capability and capacity updates signals the child cell is to be treated as a mute.
= nova(StrOpt) Name of this cell
= 10.0(FloatOpt) Percentage of cell capacity to hold in reserve. Affects both memory and disk utilization
= cells(StrOpt) The topic cells nodes listen on
+
diff --git a/doc/common/tables/ironic-common.xml b/doc/common/tables/ironic-common.xml index 18a7de5c60..33429a90e7 100644 --- a/doc/common/tables/ironic-common.xml +++ b/doc/common/tables/ironic-common.xml @@ -21,37 +21,61 @@ = /usr/local/bin (StrOpt) Directory where ironic binaries are installed. + + = pxe_ipmitool + (ListOpt) 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. + = False (BoolOpt) Enables or disables fatal status of deprecations. - = 16384 - (IntOpt) 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). + = True + (BoolOpt) Force backing images to raw format. + + + = 1 + (IntOpt) [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. + + + = 5 + (IntOpt) 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. + + + = localhost + (StrOpt) Name of this node. This can be an opaque identifier. It is not necessarily a hostname, FQDN, or IP address. However, the node name must be valid within an AMQP key, and if using ZeroMQ, a valid hostname, FQDN, or IP address. + + + = /usr/lib/syslinux/isolinux.bin + (StrOpt) Path to isolinux binary file. + + + = $pybasedir/common/isolinux_config.template + (StrOpt) Template file for isolinux configuration file. = None (ListOpt) Memcached servers or None for in process cache. - - = False - (BoolOpt) Whether to log monkey patching - - - = nova.api.ec2.cloud:nova.notifications.notify_decorator, nova.compute.api:nova.notifications.notify_decorator - (ListOpt) List of modules/decorators to monkey patch - = 10.0.0.1 (StrOpt) IP address of this host. + + = False + (BoolOpt) Run image downloads and raw format conversions in parallel. + + + = 60 + (IntOpt) Seconds between running periodic tasks. + = /usr/lib/python/site-packages/ironic/ironic (StrOpt) Directory where the ironic python module is installed. - = /etc/nova/rootwrap.conf - (StrOpt) Path to the rootwrap configuration file to use for running commands as root + = /etc/ironic/rootwrap.conf + (StrOpt) Path to the rootwrap configuration file to use for running commands as root. = True @@ -61,21 +85,9 @@ = $pybasedir (StrOpt) Top-level directory for maintaining ironic's state. - - = 600 - (IntOpt) Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not supported on OS X. - = None - (StrOpt) Explicitly specify the temporary working directory - - - = 1000 - (IntOpt) Size of the pool of greenthreads used by wsgi - - - = True - (BoolOpt) If False, closes the client socket connection explicitly. + (StrOpt) Explicitly specify the temporary working directory. diff --git a/doc/common/tables/ironic-conductor.xml b/doc/common/tables/ironic-conductor.xml index d6957e512e..05563865d2 100644 --- a/doc/common/tables/ironic-conductor.xml +++ b/doc/common/tables/ironic-conductor.xml @@ -18,67 +18,75 @@ [conductor] - api_url = None + = None (StrOpt) URL of Ironic API service. If not set ironic can get the current value from the keystone service catalog. - check_provision_state_interval = 60 + = 60 (IntOpt) Interval between checks of provision timeouts, in seconds. - deploy_callback_timeout = 1800 + = ironic_configdrive_container + (StrOpt) Name of the Swift container to store config drive data. Used when configdrive_use_swift is True. + + + = False + (BoolOpt) Whether to upload the config drive to Swift. + + + = 1800 (IntOpt) Timeout (seconds) for waiting callback from deploy ramdisk. 0 - unlimited. - force_power_state_during_sync = True + = True (BoolOpt) During sync_power_state, should the hardware power state be set to the state recorded in the database (True) or should the database be updated based on the hardware state (False). - heartbeat_interval = 10 + = 10 (IntOpt) Seconds between conductor heart beats. - heartbeat_timeout = 60 + = 60 (IntOpt) Maximum time (in seconds) since the last check-in of a conductor. - node_locked_retry_attempts = 3 + = 3 (IntOpt) Number of attempts to grab a node lock. - node_locked_retry_interval = 1 + = 1 (IntOpt) Seconds to sleep between node lock attempts. - periodic_max_workers = 8 + = 8 (IntOpt) Maximum number of worker threads that can be started simultaneously by a periodic task. Should be less than RPC thread pool size. - power_state_sync_max_retries = 3 + = 3 (IntOpt) During sync_power_state failures, limit the number of times Ironic should try syncing the hardware node power state with the node power state in DB - send_sensor_data = False + = False (BoolOpt) Enable sending sensor data message via the notification bus - send_sensor_data_interval = 600 + = 600 (IntOpt) Seconds between conductor sending sensor data message to ceilometer via the notification bus. - send_sensor_data_types = ALL + = ALL (ListOpt) List of comma separated metric types which need to be sent to Ceilometer. The default value, "ALL", is a special value meaning send all the sensor data. - sync_local_state_interval = 180 + = 180 (IntOpt) 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 + = 60 (IntOpt) Interval between syncing the node power state to the database, in seconds. - workers_pool_size = 100 + = 100 (IntOpt) The size of the workers greenthread pool. diff --git a/doc/common/tables/ironic-console.xml b/doc/common/tables/ironic-console.xml index 71e1abe45e..69162ab692 100644 --- a/doc/common/tables/ironic-console.xml +++ b/doc/common/tables/ironic-console.xml @@ -18,23 +18,23 @@ [console] - subprocess_checking_interval = 1 + = 1 (IntOpt) Time interval (in seconds) for checking the status of console subprocess. - subprocess_timeout = 10 + = 10 (IntOpt) Time (in seconds) to wait for the console subprocess to start. - terminal = shellinaboxd + = shellinaboxd (StrOpt) Path to serial console terminal program - terminal_cert_dir = None + = None (StrOpt) Directory containing the terminal SSL cert(PEM) for serial console access - terminal_pid_dir = None + = None (StrOpt) Directory for holding terminal pid files. If not specified, the temporary directory will be used. diff --git a/doc/common/tables/ironic-database.xml b/doc/common/tables/ironic-database.xml index b45d411257..89e9459cb3 100644 --- a/doc/common/tables/ironic-database.xml +++ b/doc/common/tables/ironic-database.xml @@ -101,10 +101,6 @@ = False (BoolOpt) Enable the experimental use of database reconnect on connection lost. - - = False - (BoolOpt) Enable the experimental use of thread pooling for all DB API calls - diff --git a/doc/common/tables/ironic-deploy.xml b/doc/common/tables/ironic-deploy.xml new file mode 100644 index 0000000000..b7bed0566f --- /dev/null +++ b/doc/common/tables/ironic-deploy.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of deploy configuration options
Configuration option = Default valueDescription
[deploy]
= 1M(StrOpt) Block size to use when writing to the nodes disk.
= 3(IntOpt) Maximum attempts to verify an iSCSI connection is active, sleeping 1 second between attempts.
+
diff --git a/doc/common/tables/ironic-dhcp.xml b/doc/common/tables/ironic-dhcp.xml index 8ba1868c0d..d9d2d9534f 100644 --- a/doc/common/tables/ironic-dhcp.xml +++ b/doc/common/tables/ironic-dhcp.xml @@ -18,7 +18,7 @@ [dhcp] - dhcp_provider = neutron + = neutron (StrOpt) DHCP provider to use. "neutron" uses Neutron, and "none" uses a no-op provider. diff --git a/doc/common/tables/ironic-disk_partitioner.xml b/doc/common/tables/ironic-disk_partitioner.xml index 82fa30a4a5..a7cc98edb5 100644 --- a/doc/common/tables/ironic-disk_partitioner.xml +++ b/doc/common/tables/ironic-disk_partitioner.xml @@ -18,11 +18,11 @@ [disk_partitioner] - check_device_interval = 1 + = 1 (IntOpt) After Ironic has completed creating the partition table, it continues to check for activity on the attached iSCSI device status at this interval prior to copying the image to the node, in seconds - check_device_max_retries = 20 + = 20 (IntOpt) The maximum number of times to check that the device is not accessed by another process. If the device is still busy after that, the disk partitioning will be treated as having failed. diff --git a/doc/common/tables/ironic-glance.xml b/doc/common/tables/ironic-glance.xml index d0e2d62cfa..c633db0b7b 100644 --- a/doc/common/tables/ironic-glance.xml +++ b/doc/common/tables/ironic-glance.xml @@ -19,15 +19,7 @@ = - (ListOpt) A list of url scheme that can be downloaded directly via the direct_url. Currently supported schemes: [file]. - - - = False - (BoolOpt) Allow to perform insecure SSL (https) requests to glance - - - = None - (ListOpt) A list of the glance api servers available to nova. Prefix with https:// for ssl-based glance api servers. ([hostname|ip]:port) + (ListOpt) A list of URL schemes that can be downloaded directly via the direct_url. Currently supported schemes: [file]. = keystone @@ -58,20 +50,32 @@ (StrOpt) Default protocol to use when connecting to glance. Set to https for SSL. - = $my_ip - (StrOpt) Default glance hostname or IP address + = None + (StrOpt) The account that Glance uses to communicate with Swift. The format is "AUTH_uuid". "uuid" is the UUID for the account configured in the glance-api.conf. Required for temporary URLs. For example: "AUTH_a422b2-91f3-2f46-74b7-d7c9e8958f5d30". Swift temporary URL format: "endpoint_url/api_version/account/container/object_id" - = 0 - (IntOpt) Number of retries when uploading / downloading an image to / from glance. + = v1 + (StrOpt) The Swift API version to create a temporary URL for. Defaults to "v1". Swift temporary URL format: "endpoint_url/api_version/account/container/object_id" - = 9292 - (IntOpt) Default glance port + = glance + (StrOpt) The Swift container Glance is configured to store its images in. Defaults to "glance", which is the default in glance-api.conf. Swift temporary URL format: "endpoint_url/api_version/account/container/object_id" - = http - (StrOpt) Default protocol to use when connecting to glance. Set to https for SSL. + = None + (StrOpt) The "endpoint" (scheme, hostname, optional port) for the Swift URL of the form "endpoint_url/api_version/account/container/object_id". Do not include trailing "/". For example, use "https://swift.example.com". Required for temporary URLs. + + + = 0 + (IntOpt) This should match a config by the same name in the Glance configuration file. When set to 0, a single-tenant store will only use one container to store all images. When set to an integer value between 1 and 32, a single-tenant store will use multiple containers to store images, and this value will determine how many containers are created. + + + = 1200 + (IntOpt) The length of time in seconds that the temporary URL will be valid for. Defaults to 20 minutes. If some deploys get a 401 response code when trying to download from the temporary URL, try raising this duration. + + + = None + (StrOpt) The secret token given to Swift to allow temporary URL downloads. Required for temporary URLs. diff --git a/doc/common/tables/ironic-ilo.xml b/doc/common/tables/ironic-ilo.xml index 2fab352ff0..eff38bd43c 100644 --- a/doc/common/tables/ironic-ilo.xml +++ b/doc/common/tables/ironic-ilo.xml @@ -18,27 +18,27 @@ [ilo] - client_port = 443 + = 443 (IntOpt) Port to be used for iLO operations - client_timeout = 60 + = 60 (IntOpt) Timeout (in seconds) for iLO operations - power_retry = 6 + = 6 (IntOpt) Number of times a power operation needs to be retried - power_wait = 2 + = 2 (IntOpt) Amount of time in seconds to wait in between power operations - swift_ilo_container = ironic_ilo_container + = ironic_ilo_container (StrOpt) The Swift iLO container to store data. - swift_object_expiry_timeout = 900 + = 900 (IntOpt) Amount of time in seconds for Swift objects to auto-expire. diff --git a/doc/common/tables/ironic-ipmi.xml b/doc/common/tables/ironic-ipmi.xml index a2089f3c5b..cf0b36c16a 100644 --- a/doc/common/tables/ironic-ipmi.xml +++ b/doc/common/tables/ironic-ipmi.xml @@ -18,12 +18,12 @@ [ipmi] - min_command_interval = 5 + = 5 (IntOpt) Minimum time, in seconds, between IPMI operations sent to a server. There is a risk with some hardware that setting this too low may cause the BMC to crash. Recommended setting is 5 seconds. - retry_timeout = 60 - (IntOpt) Maximum time in seconds to retry IPMI operations. + = 60 + (IntOpt) Maximum time in seconds to retry IPMI operations. There is a tradeoff when setting this value. Setting this too low may cause older BMCs to crash and require a hard reset. However, setting too high can cause the sync power state periodic task to hang when there are slow or unresponsive BMCs. diff --git a/doc/common/tables/ironic-irmc.xml b/doc/common/tables/ironic-irmc.xml new file mode 100644 index 0000000000..4aff4d4472 --- /dev/null +++ b/doc/common/tables/ironic-irmc.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Description of irmc configuration options
Configuration option = Default valueDescription
[irmc]
= basic(StrOpt) Authentication method to be used for iRMC operations, either "basic" or "digest"
= 60(IntOpt) Timeout (in seconds) for iRMC operations
= 443(IntOpt) Port to be used for iRMC operations, either 80 or 443
+
diff --git a/doc/common/tables/ironic-keystone.xml b/doc/common/tables/ironic-keystone.xml new file mode 100644 index 0000000000..dff6dd895d --- /dev/null +++ b/doc/common/tables/ironic-keystone.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + +
Description of keystone configuration options
Configuration option = Default valueDescription
[keystone]
= None(StrOpt) The region used for getting endpoints of OpenStackservices.
+
diff --git a/doc/common/tables/ironic-logging.xml b/doc/common/tables/ironic-logging.xml index 18a846dc5d..a17b2b4df0 100644 --- a/doc/common/tables/ironic-logging.xml +++ b/doc/common/tables/ironic-logging.xml @@ -27,20 +27,12 @@ = False - (BoolOpt) Make exception message format errors fatal + (BoolOpt) Make exception message format errors fatal. = "[instance: %(uuid)s] " (StrOpt) The format for an instance that is passed with the log message. - - = instance-%08x - (StrOpt) Template string to be used to generate instance names - - - = month - (StrOpt) Time period to generate instance usages for. Time period must be hour, day, month or year - = "[instance: %(uuid)s] " (StrOpt) The format for an instance UUID that is passed with the log message. diff --git a/doc/common/tables/ironic-neutron.xml b/doc/common/tables/ironic-neutron.xml index 876cc9e46c..c5a181997f 100644 --- a/doc/common/tables/ironic-neutron.xml +++ b/doc/common/tables/ironic-neutron.xml @@ -18,15 +18,19 @@ [neutron] - auth_strategy = keystone + = keystone (StrOpt) Default authentication strategy to use when connecting to neutron. Can be either "keystone" or "noauth". Running neutron in noauth mode (related to but not affected by this setting) is insecure and should only be used for testing. - url = http://$my_ip:9696 + = 3 + (IntOpt) Client retries in the case of a failed request. + + + = http://$my_ip:9696 (StrOpt) URL for connecting to neutron. - url_timeout = 30 + = 30 (IntOpt) Timeout value for connecting to neutron in seconds. diff --git a/doc/common/tables/ironic-pxe.xml b/doc/common/tables/ironic-pxe.xml index 05f745e2e5..63f85d5c74 100644 --- a/doc/common/tables/ironic-pxe.xml +++ b/doc/common/tables/ironic-pxe.xml @@ -18,75 +18,75 @@ [pxe] - default_ephemeral_format = ext4 + = ext4 (StrOpt) Default file system format for ephemeral partition, if one is created. - disk_devices = cciss/c0d0,sda,hda,vda + = cciss/c0d0,sda,hda,vda (StrOpt) The disk devices to scan while doing the deploy. - http_root = /httpboot + = /httpboot (StrOpt) Ironic compute node's HTTP root path. - http_url = None + = None (StrOpt) Ironic compute node's HTTP server URL. Example: http://192.1.2.3:8080 - image_cache_size = 20480 + = 20480 (IntOpt) Maximum size (in MiB) of cache for master images, including those in use. - image_cache_ttl = 10080 + = 10080 (IntOpt) Maximum TTL (in minutes) for old master images in cache. - images_path = /var/lib/ironic/images/ + = /var/lib/ironic/images/ (StrOpt) Directory where images are stored on disk. - instance_master_path = /var/lib/ironic/master_images + = /var/lib/ironic/master_images (StrOpt) Directory where master instance images are stored on disk. - ipxe_boot_script = $pybasedir/drivers/modules/boot.ipxe + = $pybasedir/drivers/modules/boot.ipxe (StrOpt) The path to the main iPXE script file. - ipxe_enabled = False + = False (BoolOpt) Enable iPXE boot. - pxe_append_params = nofb nomodeset vga=normal + = nofb nomodeset vga=normal (StrOpt) Additional append parameters for baremetal PXE boot. - pxe_bootfile_name = pxelinux.0 + = pxelinux.0 (StrOpt) Bootfile DHCP parameter. - pxe_config_template = $pybasedir/drivers/modules/pxe_config.template + = $pybasedir/drivers/modules/pxe_config.template (StrOpt) Template file for PXE configuration. - tftp_master_path = /tftpboot/master_images + = /tftpboot/master_images (StrOpt) Directory where master tftp images are stored on disk. - tftp_root = /tftpboot + = /tftpboot (StrOpt) Ironic compute node's tftp root path. - tftp_server = $my_ip + = $my_ip (StrOpt) IP address of Ironic compute node's tftp server. - uefi_pxe_bootfile_name = elilo.efi + = elilo.efi (StrOpt) Bootfile DHCP parameter for UEFI boot mode. - uefi_pxe_config_template = $pybasedir/drivers/modules/elilo_efi_pxe_config.template + = $pybasedir/drivers/modules/elilo_efi_pxe_config.template (StrOpt) Template file for PXE configuration for UEFI boot loader. diff --git a/doc/common/tables/ironic-rabbitmq.xml b/doc/common/tables/ironic-rabbitmq.xml index ed0fd4b531..021c3067cf 100644 --- a/doc/common/tables/ironic-rabbitmq.xml +++ b/doc/common/tables/ironic-rabbitmq.xml @@ -35,7 +35,7 @@ = - (StrOpt) SSL version to use (valid only if SSL enabled). valid values are TLSv1 and SSLv23. SSLv2 and SSLv3 may be available on some distributions. + (StrOpt) SSL version to use (valid only if SSL enabled). Valid values are TLSv1 and SSLv23. SSLv2, SSLv3, TLSv1_1, and TLSv1_2 may be available on some distributions. = False diff --git a/doc/common/tables/ironic-rpc.xml b/doc/common/tables/ironic-rpc.xml index 907350f39f..7458df71ae 100644 --- a/doc/common/tables/ironic-rpc.xml +++ b/doc/common/tables/ironic-rpc.xml @@ -43,7 +43,18 @@ = 64 - (IntOpt) Size of RPC greenthread pool. + (IntOpt) Size of RPC thread pool. + + + [oslo_concurrency] + + + = False + (BoolOpt) Enables or disables inter-process locks. + + + = None + (StrOpt) Directory to use for lock files. For security, the specified directory should only be writable by the user running the processes that need locking. Defaults to environment variable OSLO_LOCK_PATH. If external locks are used, a lock path must be set. diff --git a/doc/common/tables/ironic-seamicro.xml b/doc/common/tables/ironic-seamicro.xml index 38fc3949c0..bb305d6f45 100644 --- a/doc/common/tables/ironic-seamicro.xml +++ b/doc/common/tables/ironic-seamicro.xml @@ -18,11 +18,11 @@ [seamicro] - action_timeout = 10 + = 10 (IntOpt) Seconds to wait for power action to be completed - max_retry = 3 + = 3 (IntOpt) Maximum retries for SeaMicro operations diff --git a/doc/common/tables/ironic-snmp.xml b/doc/common/tables/ironic-snmp.xml index 8b44361b25..94f9215c84 100644 --- a/doc/common/tables/ironic-snmp.xml +++ b/doc/common/tables/ironic-snmp.xml @@ -18,7 +18,7 @@ [snmp] - power_timeout = 10 + = 10 (IntOpt) Seconds to wait for power action to be completed diff --git a/doc/common/tables/ironic-ssh.xml b/doc/common/tables/ironic-ssh.xml index c30129f809..9a84942bec 100644 --- a/doc/common/tables/ironic-ssh.xml +++ b/doc/common/tables/ironic-ssh.xml @@ -18,7 +18,7 @@ [ssh] - libvirt_uri = qemu:///system + = qemu:///system (StrOpt) libvirt uri diff --git a/doc/common/tables/ironic-swift.xml b/doc/common/tables/ironic-swift.xml index 821d0fdcb2..e659130985 100644 --- a/doc/common/tables/ironic-swift.xml +++ b/doc/common/tables/ironic-swift.xml @@ -18,7 +18,7 @@ [swift] - swift_max_retries = 2 + = 2 (IntOpt) Maximum number of times to retry a Swift request, before failing. diff --git a/doc/common/tables/ironic-virtualbox.xml b/doc/common/tables/ironic-virtualbox.xml new file mode 100644 index 0000000000..d763397916 --- /dev/null +++ b/doc/common/tables/ironic-virtualbox.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + +
Description of virtualbox configuration options
Configuration option = Default valueDescription
[virtualbox]
= 18083(IntOpt) Port on which VirtualBox web service is listening.
+
diff --git a/doc/common/tables/ironic-zeromq.xml b/doc/common/tables/ironic-zeromq.xml index 88917c4d8c..0b95188fdf 100644 --- a/doc/common/tables/ironic-zeromq.xml +++ b/doc/common/tables/ironic-zeromq.xml @@ -34,7 +34,7 @@ (StrOpt) Directory for holding IPC sockets. - = oslo.messaging._drivers.matchmaker.MatchMakerLocalhost + = oslo_messaging._drivers.matchmaker.MatchMakerLocalhost (StrOpt) MatchMaker driver. diff --git a/tools/autogenerate-config-flagmappings/ironic.flagmappings b/tools/autogenerate-config-flagmappings/ironic.flagmappings index ef328d614e..7495527c12 100644 --- a/tools/autogenerate-config-flagmappings/ironic.flagmappings +++ b/tools/autogenerate-config-flagmappings/ironic.flagmappings @@ -1,23 +1,23 @@ amqp_auto_delete amqp amqp_durable_queues amqp -api_paste_config api -api_rate_limit api auth_strategy auth backdoor_port debug -baremetal_scheduler_default_filters scheduler bindir common -client_socket_timeout api -compute_driver compute control_exchange amqp debug logging default_log_levels logging +enabled_drivers common fake_rabbit testing fatal_deprecations common fatal_exception_format_errors logging +force_raw_images common +hash_distribution_replicas common +hash_partition_exponent common +host common instance_format logging -instance_name_template logging -instance_usage_audit_period logging instance_uuid_format logging +isolinux_bin common +isolinux_config_template common kombu_reconnect_delay rabbitmq kombu_ssl_ca_certs rabbitmq kombu_ssl_certfile rabbitmq @@ -34,13 +34,12 @@ logging_default_format_string logging logging_exception_prefix logging matchmaker_heartbeat_freq rpc matchmaker_heartbeat_ttl rpc -max_header_line common memcached_servers common -monkey_patch common -monkey_patch_modules common my_ip common notification_driver amqp notification_topics amqp +parallel_image_downloads common +periodic_interval common policy_default_rule policy policy_dirs policy policy_file policy @@ -83,28 +82,56 @@ rpc_zmq_matchmaker zeromq rpc_zmq_port zeromq rpc_zmq_topic_backlog zeromq run_external_periodic_tasks common -scheduler_available_filters scheduler -scheduler_default_filters scheduler -scheduler_use_baremetal_filters scheduler -scheduler_weight_classes scheduler -ssl_ca_file ssl -ssl_cert_file ssl -ssl_key_file ssl state_path common syslog_log_facility logging -tcp_keepidle common tempdir common transport_url amqp -use_forwarded_for api use_stderr logging use_syslog logging use_syslog_rfc_format logging verbose logging -wsgi_default_pool_size common -wsgi_keep_alive common +agent/agent_api_version agent +agent/agent_pxe_append_params agent +agent/agent_pxe_bootfile_name agent +agent/agent_pxe_config_template agent +agent/heartbeat_timeout agent +amt/protocol amt api/host_ip api api/max_limit api api/port api +cells/bandwidth_update_interval cells +cells/call_timeout cells +cells/capabilities cells +cells/cell_type cells +cells/enable cells +cells/manager cells +cells/mute_child_interval cells +cells/name cells +cells/reserve_percent cells +cells/topic cells +conductor/api_url conductor +conductor/check_provision_state_interval conductor +conductor/configdrive_swift_container conductor +conductor/configdrive_use_swift conductor +conductor/deploy_callback_timeout conductor +conductor/force_power_state_during_sync conductor +conductor/heartbeat_interval conductor +conductor/heartbeat_timeout conductor +conductor/node_locked_retry_attempts conductor +conductor/node_locked_retry_interval conductor +conductor/periodic_max_workers conductor +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/sync_local_state_interval conductor +conductor/sync_power_state_interval conductor +conductor/workers_pool_size conductor +console/subprocess_checking_interval console +console/subprocess_timeout console +console/terminal console +console/terminal_cert_dir console +console/terminal_pid_dir console database/backend database database/connection database database/connection_debug database @@ -126,10 +153,12 @@ database/slave_connection database database/sqlite_db database database/sqlite_synchronous database database/use_db_reconnect database -database/use_tpool database +deploy/dd_block_size deploy +deploy/iscsi_verify_attempts deploy +dhcp/dhcp_provider dhcp +disk_partitioner/check_device_interval disk_partitioner +disk_partitioner/check_device_max_retries disk_partitioner glance/allowed_direct_url_schemes glance -glance/api_insecure glance -glance/api_servers glance glance/auth_strategy glance glance/glance_api_insecure glance glance/glance_api_servers glance @@ -137,10 +166,25 @@ glance/glance_host glance glance/glance_num_retries glance glance/glance_port glance glance/glance_protocol glance -glance/host glance -glance/num_retries glance -glance/port glance -glance/protocol glance +glance/swift_account glance +glance/swift_api_version glance +glance/swift_container glance +glance/swift_endpoint_url glance +glance/swift_store_multiple_containers_seed glance +glance/swift_temp_url_duration glance +glance/swift_temp_url_key glance +ilo/client_port ilo +ilo/client_timeout ilo +ilo/power_retry ilo +ilo/power_wait ilo +ilo/swift_ilo_container ilo +ilo/swift_object_expiry_timeout ilo +ipmi/min_command_interval ipmi +ipmi/retry_timeout ipmi +irmc/auth_method irmc +irmc/client_timeout irmc +irmc/port irmc +keystone/region_name keystone keystone_authtoken/admin_password auth_token keystone_authtoken/admin_tenant_name auth_token keystone_authtoken/admin_token auth_token @@ -182,6 +226,12 @@ matchmaker_redis/host redis matchmaker_redis/password redis matchmaker_redis/port redis matchmaker_ring/ringfile redis +neutron/auth_strategy neutron +neutron/retries neutron +neutron/url neutron +neutron/url_timeout neutron +oslo_concurrency/disable_process_locking rpc +oslo_concurrency/lock_path rpc oslo_messaging_amqp/allow_insecure_clients amqp oslo_messaging_amqp/broadcast_prefix amqp oslo_messaging_amqp/container_name amqp @@ -193,4 +243,27 @@ oslo_messaging_amqp/ssl_cert_file ca oslo_messaging_amqp/ssl_key_file ca oslo_messaging_amqp/ssl_key_password ca oslo_messaging_amqp/trace amqp -upgrade_levels/cells upgrades +pxe/default_ephemeral_format pxe +pxe/disk_devices pxe +pxe/http_root pxe +pxe/http_url pxe +pxe/image_cache_size pxe +pxe/image_cache_ttl pxe +pxe/images_path pxe +pxe/instance_master_path pxe +pxe/ipxe_boot_script pxe +pxe/ipxe_enabled pxe +pxe/pxe_append_params pxe +pxe/pxe_bootfile_name pxe +pxe/pxe_config_template 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 +snmp/power_timeout snmp +ssh/libvirt_uri ssh +swift/swift_max_retries swift +virtualbox/port virtualbox diff --git a/tools/autogenerate-config-flagmappings/ironic.headers b/tools/autogenerate-config-flagmappings/ironic.headers index 7e6e666b5f..f7a200696e 100644 --- a/tools/autogenerate-config-flagmappings/ironic.headers +++ b/tools/autogenerate-config-flagmappings/ironic.headers @@ -1,7 +1,13 @@ +amt AMT +cells cell +deploy deploy dhcp DHCP disk_partitioner disk partitioner ilo ILO +irmc iRMC +keystone keystone seamicro SeaMicro snmp SNMP ssh SSH pxe PXE +virtualbox VirtualBox