diff options
| author | Chris Krelle <nobodycam@gmail.com> | 2015-01-29 14:20:14 -0800 |
|---|---|---|
| committer | Chris Krelle <nobodycam@gmail.com> | 2015-01-29 16:25:14 -0800 |
| commit | 9983b45df3220937c27bd56dbfa46ccda9d32cb0 (patch) | |
| tree | b55c4dee1bdc532b77bd97a93171e0b56bd0ac42 /etc | |
| parent | 8dbaefee760632c1d93e2a0bb3a5bd38822fae6b (diff) | |
| download | ironic-9983b45df3220937c27bd56dbfa46ccda9d32cb0.tar.gz | |
Fix typos in commit I68c9f9f86f5f113bb111c0f4fd83216ae0659d36
This patch addresses the comments on the final revision of patch 150187
Also pointed out was the fact that a minor behaviour change was
not noted in the commit message of the base patch:
verify_iscsi_connection can raise exception.InstanceDeployFailure
should the function timeout.
Change-Id: If298cdaf39c72563b53fa656da636d25b93528c4
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/ironic/ironic.conf.sample | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample index f497e5a90..ad7fcb253 100644 --- a/etc/ironic/ironic.conf.sample +++ b/etc/ironic/ironic.conf.sample @@ -55,9 +55,9 @@ # (integer value) #qpid_topology_version=1 -# SSL version to use (valid only if SSL enabled). valid values -# are TLSv1 and SSLv23. SSLv2 and SSLv3 may be available on -# some distributions. (string value) +# 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. (string value) #kombu_ssl_version= # SSL key file (valid only if SSL enabled). (string value) @@ -127,7 +127,7 @@ #rpc_zmq_bind_address=* # MatchMaker driver. (string value) -#rpc_zmq_matchmaker=oslo.messaging._drivers.matchmaker.MatchMakerLocalhost +#rpc_zmq_matchmaker=oslo_messaging._drivers.matchmaker.MatchMakerLocalhost # ZeroMQ receiver listening port. (integer value) #rpc_zmq_port=9501 @@ -157,7 +157,7 @@ # Heartbeat time-to-live. (integer value) #matchmaker_heartbeat_ttl=600 -# Size of RPC greenthread pool. (integer value) +# Size of RPC thread pool. (integer value) #rpc_thread_pool_size=64 # Driver or drivers to handle sending notifications. (multi @@ -191,7 +191,7 @@ # # IP address of this host. (string value) -#my_ip=10.0.0.1 +#my_ip=192.168.122.1 # @@ -741,8 +741,8 @@ # value) #dd_block_size=1M -# Max attempts to verify a iSCSI connection is active. -# (integer value) +# Maximum attempts to verify an iSCSI connection is active, +# sleeping 1 second between attempts. (integer value) #iscsi_verify_attempts=3 |