Merge "Fix ssh_host_key_file default in help and config.sample.conf"

This commit is contained in:
Jenkins 2014-09-23 21:22:36 +00:00 committed by Gerrit Code Review
commit a194796e0a
2 changed files with 2 additions and 2 deletions

View File

@ -44,7 +44,7 @@ ssh_opts = [
default='$state_path/ssh_known_hosts',
help='File containing SSH host keys for the systems with which '
'Cinder needs to communicate. OPTIONAL: '
'Default=$state_path/known_hosts'),
'Default=$state_path/ssh_known_hosts'),
]
CONF = cfg.CONF

View File

@ -283,7 +283,7 @@
# File containing SSH host keys for the systems with which
# Cinder needs to communicate. OPTIONAL:
# Default=$state_path/known_hosts (string value)
# Default=$state_path/ssh_known_hosts (string value)
#ssh_hosts_key_file=$state_path/ssh_known_hosts