diff --git a/doc/common/tables/ironic-agent.xml b/doc/common/tables/ironic-agent.xml index 0253af9f41..565e13cde2 100644 --- a/doc/common/tables/ironic-agent.xml +++ b/doc/common/tables/ironic-agent.xml @@ -21,6 +21,10 @@ = v1 (StrOpt) API version to use for communicating with the ramdisk agent. + + = 1 + (IntOpt) Number of iterations to be run for erasing devices. + = None (IntOpt) Priority to run in-band erase devices via the Ironic Python Agent ramdisk. If unset, will use the priority set in the ramdisk (defaults to 10 for the GenericHardwareManager). If set to 0, will not run during cleaning. @@ -45,6 +49,14 @@ = True (BoolOpt) Whether Ironic will manage TFTP files for the deploy ramdisks. If set to False, you will need to configure your own TFTP server that allows booting the deploy ramdisks. + + = 6 + (IntOpt) Number of times to retry getting power state to check if bare metal node has been powered off after a soft power off. + + + = 5 + (IntOpt) Amount of time (in seconds) to wait between polling power state after trigger soft poweroff. + diff --git a/doc/common/tables/ironic-amqp.xml b/doc/common/tables/ironic-amqp.xml index 05ae61879c..3d6aacbf28 100644 --- a/doc/common/tables/ironic-amqp.xml +++ b/doc/common/tables/ironic-amqp.xml @@ -23,7 +23,7 @@ = [] - (MultiStrOpt) Driver or drivers to handle sending notifications. + (MultiStrOpt) The Drivers(s) to handle sending notifications. Possible values are messaging, messagingv2, routing, log, test, noop = notifications diff --git a/doc/common/tables/ironic-api.xml b/doc/common/tables/ironic-api.xml index 975cad8f04..a5534b76dc 100644 --- a/doc/common/tables/ironic-api.xml +++ b/doc/common/tables/ironic-api.xml @@ -29,6 +29,13 @@ = 6385 (IntOpt) The TCP port on which ironic-api listens. + + [oslo_versionedobjects] + + + = False + (BoolOpt) Make exception message format errors fatal + diff --git a/doc/common/tables/ironic-auth_token.xml b/doc/common/tables/ironic-auth_token.xml index bcccb09b31..13e428df29 100644 --- a/doc/common/tables/ironic-auth_token.xml +++ b/doc/common/tables/ironic-auth_token.xml @@ -119,7 +119,7 @@ = 10 - (IntOpt) (Optional) Number of seconds that an operation will wait to get a memcache client connection from the pool. + (IntOpt) (Optional) Number of seconds that an operation will wait to get a memcached client connection from the pool. = 300 @@ -131,7 +131,7 @@ = 3 - (IntOpt) (Optional) Socket timeout in seconds for communicating with a memcache server. + (IntOpt) (Optional) Socket timeout in seconds for communicating with a memcached server. = 60 @@ -147,7 +147,7 @@ = False - (BoolOpt) (Optional) Use the advanced (eventlet safe) memcache client pool. The advanced pool will only work under python 2.x. + (BoolOpt) (Optional) Use the advanced (eventlet safe) memcached client pool. The advanced pool will only work under python 2.x. = None diff --git a/doc/common/tables/ironic-common.xml b/doc/common/tables/ironic-common.xml index 5a21b67365..b292126b61 100644 --- a/doc/common/tables/ironic-common.xml +++ b/doc/common/tables/ironic-common.xml @@ -43,11 +43,11 @@ = 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. + (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. + = sd-52009.dedibox.fr + (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 @@ -81,17 +81,13 @@ = /etc/ironic/rootwrap.conf (StrOpt) Path to the rootwrap configuration file to use for running commands as root. - - = True - (BoolOpt) Some periodic tasks can be run in a separate process. Should we run them here? - = $pybasedir (StrOpt) Top-level directory for maintaining ironic's state. - = None - (StrOpt) Explicitly specify the temporary working directory. + = /tmp + (StrOpt) Temporary working directory, default is Python temp dir. diff --git a/doc/common/tables/ironic-debug.xml b/doc/common/tables/ironic-debug.xml index 24dd201540..b2276fcbfa 100644 --- a/doc/common/tables/ironic-debug.xml +++ b/doc/common/tables/ironic-debug.xml @@ -17,10 +17,6 @@ [DEFAULT] - - = None - (StrOpt) Enable eventlet backdoor. Acceptable values are 0, <port>, and <start>:<end>, where 0 results in listening on a random tcp port number; <port> results in listening on the specified port number (and not enabling backdoor if that port is in use); and <start>:<end> results in listening on the smallest unused port number within the specified range of port numbers. The chosen port is displayed in the service's log file. - = False (BoolOpt) Enable pecan debug mode. WARNING: this is insecure and should not be used in a production environment. diff --git a/doc/common/tables/ironic-ilo.xml b/doc/common/tables/ironic-ilo.xml index ba373a393f..19b61bb3c0 100644 --- a/doc/common/tables/ironic-ilo.xml +++ b/doc/common/tables/ironic-ilo.xml @@ -39,7 +39,7 @@ = 20 - (IntOpt) Priority for reset_secure_boot_keys clean step. This step will reset the secure boot keys to manufacturing defaults. + (IntOpt) Priority for reset_secure_boot_keys clean step. This step will reset the secure boot keys to manufacturing defaults. = 443 diff --git a/doc/common/tables/ironic-irmc.xml b/doc/common/tables/ironic-irmc.xml index 8a934923a2..40caea3218 100644 --- a/doc/common/tables/ironic-irmc.xml +++ b/doc/common/tables/ironic-irmc.xml @@ -29,6 +29,34 @@ = 443 (IntOpt) Port to be used for iRMC operations, either 80 or 443 + + = None + (StrOpt) IP of remote image server + + + = share + (StrOpt) share name of remote_image_server + + + = /remote_image_share_root + (StrOpt) Ironic conductor node's "NFS" or "CIFS" root path + + + = CIFS + (StrOpt) Share type of virtual media, either "NFS" or "CIFS" + + + = + (StrOpt) Domain name of remote_image_user_name + + + = None + (StrOpt) User name of remote_image_server + + + = None + (StrOpt) Password of remote_image_user_name + = ipmitool (StrOpt) Sensor data retrieval method, either "ipmitool" or "scci" diff --git a/doc/common/tables/ironic-logging.xml b/doc/common/tables/ironic-logging.xml index bf3a7bcba3..5893ffc789 100644 --- a/doc/common/tables/ironic-logging.xml +++ b/doc/common/tables/ironic-logging.xml @@ -87,7 +87,7 @@ = False - (BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED during I, and changed in J to honor RFC5424. + (BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED and will be changed later to honor RFC5424. = True diff --git a/doc/common/tables/ironic-qpid.xml b/doc/common/tables/ironic-qpid.xml index 1b432c25ae..421cc58b24 100644 --- a/doc/common/tables/ironic-qpid.xml +++ b/doc/common/tables/ironic-qpid.xml @@ -70,8 +70,8 @@ (StrOpt) Username for Qpid connection. - = 30 - (IntOpt) Size of RPC connection pool. + = False + (BoolOpt) Send a single AMQP reply to call message. The current behaviour since oslo-incubator is to send two AMQP replies - first one with the payload, a second one to ensure the other have finish to send the payload. We are going to remove it in the N release, but we must keep backward compatible at the same time. This option provides such compatibility - it defaults to False in Liberty and can be turned on for early adopters with a new installations or for testing. Please note, that this option will be removed in M release. diff --git a/doc/common/tables/ironic-rabbitmq.xml b/doc/common/tables/ironic-rabbitmq.xml index 23ad20cfe9..232ba1095c 100644 --- a/doc/common/tables/ironic-rabbitmq.xml +++ b/doc/common/tables/ironic-rabbitmq.xml @@ -34,13 +34,17 @@ (IntOpt) How often times during the heartbeat_timeout_threshold we check the heartbeat. - = 0 - (IntOpt) Number of seconds after which the Rabbit broker is considered down if heartbeat's keep-alive fails (0 disables the heartbeat, >0 enables it. Enabling heartbeats requires kombu>=3.0.7 and amqp>=1.4.0). EXPERIMENTAL + = 60 + (IntOpt) Number of seconds after which the Rabbit broker is considered down if heartbeat's keep-alive fails (0 disable the heartbeat). EXPERIMENTAL = 1.0 (FloatOpt) How long to wait before reconnecting in response to an AMQP consumer cancel notification. + + = 60 + (IntOpt) How long to wait before considering a reconnect attempt to have failed. This value should not be longer than rpc_response_timeout. + = (StrOpt) SSL certification authority file (valid only if SSL enabled). @@ -106,8 +110,8 @@ (StrOpt) The RabbitMQ virtual host. - = 30 - (IntOpt) Size of RPC connection pool. + = False + (BoolOpt) Send a single AMQP reply to call message. The current behaviour since oslo-incubator is to send two AMQP replies - first one with the payload, a second one to ensure the other have finish to send the payload. We are going to remove it in the N release, but we must keep backward compatible at the same time. This option provides such compatibility - it defaults to False in Liberty and can be turned on for early adopters with a new installations or for testing. Please note, that this option will be removed in M release. diff --git a/doc/common/tables/ironic-rpc.xml b/doc/common/tables/ironic-rpc.xml index 6368b40337..8724e1a6ef 100644 --- a/doc/common/tables/ironic-rpc.xml +++ b/doc/common/tables/ironic-rpc.xml @@ -33,6 +33,10 @@ = 30 (IntOpt) Seconds to wait before a cast expires (TTL). Only supported by impl_zmq. + + = 30 + (IntOpt) Size of RPC connection pool. + = 60 (IntOpt) Seconds to wait for a response from a call. diff --git a/tools/autogenerate-config-flagmappings/ironic.flagmappings b/tools/autogenerate-config-flagmappings/ironic.flagmappings index dbf1a5be9a..677928f211 100644 --- a/tools/autogenerate-config-flagmappings/ironic.flagmappings +++ b/tools/autogenerate-config-flagmappings/ironic.flagmappings @@ -1,5 +1,4 @@ auth_strategy auth -backdoor_port debug bindir common control_exchange amqp debug logging @@ -39,6 +38,7 @@ pybasedir common rootwrap_config common rpc_backend rpc rpc_cast_timeout rpc +rpc_conn_pool_size rpc rpc_response_timeout rpc rpc_thread_pool_size rpc rpc_zmq_bind_address zeromq @@ -48,7 +48,6 @@ rpc_zmq_ipc_dir zeromq rpc_zmq_matchmaker zeromq rpc_zmq_port zeromq rpc_zmq_topic_backlog zeromq -run_external_periodic_tasks common state_path common syslog_log_facility logging tempdir common @@ -58,12 +57,15 @@ use_syslog logging use_syslog_rfc_format logging verbose logging agent/agent_api_version agent +agent/agent_erase_devices_iterations agent agent/agent_erase_devices_priority agent agent/agent_pxe_append_params agent agent/agent_pxe_bootfile_name agent agent/agent_pxe_config_template agent agent/heartbeat_timeout agent agent/manage_tftp agent +agent/post_deploy_get_power_state_retries agent +agent/post_deploy_get_power_state_retry_interval agent amt/action_wait amt amt/max_attempts amt amt/protocol amt @@ -161,6 +163,13 @@ ipmi/retry_timeout ipmi irmc/auth_method irmc irmc/client_timeout irmc irmc/port irmc +irmc/remote_image_server irmc +irmc/remote_image_share_name irmc +irmc/remote_image_share_root irmc +irmc/remote_image_share_type irmc +irmc/remote_image_user_domain irmc +irmc/remote_image_user_name irmc +irmc/remote_image_user_password irmc irmc/sensor_method irmc keystone/region_name keystone keystone_authtoken/admin_password auth_token @@ -235,13 +244,14 @@ oslo_messaging_qpid/qpid_sasl_mechanisms qpid oslo_messaging_qpid/qpid_tcp_nodelay qpid oslo_messaging_qpid/qpid_topology_version qpid oslo_messaging_qpid/qpid_username qpid -oslo_messaging_qpid/rpc_conn_pool_size qpid +oslo_messaging_qpid/send_single_reply qpid oslo_messaging_rabbit/amqp_auto_delete rabbitmq oslo_messaging_rabbit/amqp_durable_queues rabbitmq oslo_messaging_rabbit/fake_rabbit rabbitmq oslo_messaging_rabbit/heartbeat_rate rabbitmq oslo_messaging_rabbit/heartbeat_timeout_threshold rabbitmq oslo_messaging_rabbit/kombu_reconnect_delay rabbitmq +oslo_messaging_rabbit/kombu_reconnect_timeout rabbitmq oslo_messaging_rabbit/kombu_ssl_ca_certs rabbitmq oslo_messaging_rabbit/kombu_ssl_certfile rabbitmq oslo_messaging_rabbit/kombu_ssl_keyfile rabbitmq @@ -258,10 +268,11 @@ oslo_messaging_rabbit/rabbit_retry_interval rabbitmq oslo_messaging_rabbit/rabbit_use_ssl rabbitmq oslo_messaging_rabbit/rabbit_userid rabbitmq oslo_messaging_rabbit/rabbit_virtual_host rabbitmq -oslo_messaging_rabbit/rpc_conn_pool_size rabbitmq +oslo_messaging_rabbit/send_single_reply rabbitmq oslo_policy/policy_default_rule policy oslo_policy/policy_dirs policy oslo_policy/policy_file policy +oslo_versionedobjects/fatal_exception_format_errors api pxe/default_ephemeral_format pxe pxe/disk_devices pxe pxe/http_root pxe