Fix ssh_host_key_file default in help and config.sample.conf

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

diff --git a/cinder/ssh_utils.py b/cinder/ssh_utils.py
index 98af05ffa307af965315cb8c7adc6918c0acdc19..e2ef25e9a07bb72d7b27af1043bd46d07ed1e906 100644 (file)
--- a/cinder/ssh_utils.py
+++ b/cinder/ssh_utils.py
@@ -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

diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample
index 4ba44f58e2aa4223707b9c3066c7526fef0f4c2c..8bcdcd402248720145ad2cb9aff1261c4b43de3b 100644 (file)
--- a/etc/cinder/cinder.conf.sample
+++ b/etc/cinder/cinder.conf.sample
@@ -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