From 49ddd125a37e50cc2afe1ebecacac1a34742f478 Mon Sep 17 00:00:00 2001
From: Mark Sturdevant <mark.sturdevant@hp.com>
Date: Mon, 22 Sep 2014 22:45:14 -0700
Subject: [PATCH] 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
---
cinder/ssh_utils.py | 2 +-
etc/cinder/cinder.conf.sample | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cinder/ssh_utils.py b/cinder/ssh_utils.py
index 98af05ffa..e2ef25e9a 100644
--- 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 4ba44f58e..8bcdcd402 100644
--- 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
--
2.45.2