openstack/cinder
Code Issues Proposed changes

Fix ssh_host_key_file default in help and config.sample.conf

Browse Source 
The commit message and the actual default say the default value for
ssh_host_key_file is $state_path/ssh_known_hosts, but the
config.conf.sample and the config opts help say it is
"$state_path/known_hosts".

Fix the help and config.conf.sample to match the actual default.

Closes-Bug: 1372765
Change-Id: I51a2918155a27afcf48eda01f32774ce0d346d06
This commit is contained in:
Mark Sturdevant 2014-09-22 22:45:14 -07:00
parent db2c817fc7
commit 49ddd125a3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/ssh_utils.py
View File

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

2
etc/cinder/cinder.conf.sample
View File

@ -283,7 +283,7 @@
# File containing SSH host keys for the systems with which # File containing SSH host keys for the systems with which
# Cinder needs to communicate. OPTIONAL: # 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 #ssh_hosts_key_file=$state_path/ssh_known_hosts