summaryrefslogtreecommitdiff
path: root/api-ref
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-12-11 06:27:51 +0000
committerGerrit Code Review <review@openstack.org>2018-12-11 06:27:51 +0000
commitbe8d81becd0c34405f48d45831726c4b4e1fc8b8 (patch)
tree78f93fd1b24fa85340d70478e6c2c1600e2a5c5c /api-ref
parente7184c3cce9f21fca1f920d6d2feb24ac0d551d7 (diff)
parentd379357cadbefd200f877ae7c725d7c6a1024ee5 (diff)
downloadironic-be8d81becd0c34405f48d45831726c4b4e1fc8b8.tar.gz
Merge "Introduce configuration option [ipmi]ipmi_disable_timeout"12.0.0
Diffstat (limited to 'api-ref')
-rw-r--r--api-ref/source/samples/driver-property-response.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/api-ref/source/samples/driver-property-response.json b/api-ref/source/samples/driver-property-response.json
index 0cab58c10..ca946852b 100644
--- a/api-ref/source/samples/driver-property-response.json
+++ b/api-ref/source/samples/driver-property-response.json
@@ -7,7 +7,7 @@
"image_no_proxy": "A comma-separated list of host names, IP addresses and domain names (with optional :port) that will be excluded from proxying. To denote a domain name, use a dot to prefix the domain name. This value will be ignored if ``image_http_proxy`` and ``image_https_proxy`` are not specified. Optional.",
"ipmi_address": "IP address or hostname of the node. Required.",
"ipmi_bridging": "bridging_type; default is \"no\". One of \"single\", \"dual\", \"no\". Optional.",
- "ipmi_disable_timeout": "By default ironic will send a raw IPMI command to disable the 60 second timeout for booting. Setting this option to False will NOT send that command; default value is True. Optional.",
+ "ipmi_disable_boot_timeout": "By default ironic will send a raw IPMI command to disable the 60 second timeout for booting. Setting this option to False will NOT send that command; default value is True. Optional.",
"ipmi_force_boot_device": "Whether Ironic should specify the boot device to the BMC each time the server is turned on, eg. because the BMC is not capable of remembering the selected boot device across power cycles; default value is False. Optional.",
"ipmi_local_address": "local IPMB address for bridged requests. Used only if ipmi_bridging is set to \"single\" or \"dual\". Optional.",
"ipmi_password": "password. Optional.",