diff options
| author | Shivanand Tendulker <stendulker@gmail.com> | 2017-11-03 07:34:03 -0400 |
|---|---|---|
| committer | Dmitry Tantsur <divius.inside@gmail.com> | 2018-01-27 09:20:04 +0000 |
| commit | b9b4a55a4193dddb1d4d34a9d1e1fc84c5d90583 (patch) | |
| tree | 51fbedbfa395fb385a56952cc3d3b8a616ba03d4 /etc | |
| parent | 7394dbbacb1d6feeeb7b5faa58d1e6cab64ddd25 (diff) | |
| download | ironic-b9b4a55a4193dddb1d4d34a9d1e1fc84c5d90583.tar.gz | |
Update description for config params of 'rescue' interface
As ``rescue`` API implementation has merged, we can let users use
configuration parameters related to this feature. This patch fixes
the help messages for the same.
Change-Id: Idab95302011c3bb3f1db560a6a3f9481371e7671
Partial-bug: #1526449
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/ironic/ironic.conf.sample | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample index 7615fc65d..f3c2036bd 100644 --- a/etc/ironic/ironic.conf.sample +++ b/etc/ironic/ironic.conf.sample @@ -242,17 +242,14 @@ # "ironic.hardware.interfaces.rescue" entrypoint. When setting # this value, please make sure that every enabled hardware # type will have the same set of enabled rescue interfaces on -# every ironic-conductor service. This option is part of -# rescue feature work, which is not currently exposed to -# users. (list value) +# every ironic-conductor service. (list value) #enabled_rescue_interfaces = no-rescue # Default rescue interface to be used for nodes that do not # have rescue_interface field set. A complete list of rescue # interfaces present on your system may be found by # enumerating the "ironic.hardware.interfaces.rescue" -# entrypoint. This option is part of rescue feature work, -# which is not currently exposed to users. (string value) +# entrypoint. (string value) #default_rescue_interface = <None> # Specify the list of storage interfaces to load during @@ -1267,9 +1264,8 @@ # (integer value) #check_provision_state_interval = 60 -# Interval (seconds) between checks of rescue timeouts. This -# option is part of rescue feature work, which is not -# currently exposed to users. (integer value) +# Interval (seconds) between checks of rescue timeouts. +# (integer value) # Minimum value: 1 #check_rescue_state_interval = 60 @@ -1364,8 +1360,7 @@ # Timeout (seconds) to wait for a callback from the rescue # ramdisk. If the timeout is reached the node will be put in # the "rescue failed" provision state. Set to 0 to disable -# timeout. This option is part of rescue feature work, which -# is not currently exposed to users. (integer value) +# timeout. (integer value) # Minimum value: 0 #rescue_callback_timeout = 1800 @@ -2852,17 +2847,14 @@ # Required for "neutron" network interface, if rescue mode # will be used. It is not used for the "flat" or "noop" # network interfaces. If a name is provided, it must be unique -# among all networks or rescue will fail. This option is part -# of rescue feature work, which is not currently exposed to -# users. (string value) +# among all networks or rescue will fail. (string value) #rescuing_network = <None> # List of Neutron Security Group UUIDs to be applied during # the node rescue process. Optional for the "neutron" network # interface and not used for the "flat" or "noop" network # interfaces. If not specified, the default security group is -# used. This option is part of rescue feature work, which is -# not currently exposed to users. (list value) +# used. (list value) #rescuing_network_security_groups = # Client retries in the case of a failed request. (integer |