From dc79609820d585c66bbcfa2138d260fb7b223b86 Mon Sep 17 00:00:00 2001
From: Kaifeng Wang <kaifeng.w@gmail.com>
Date: Wed, 24 Jun 2020 14:50:51 +0800
Subject: [PATCH] Update [console]kill_timeout description

The configuration option [console]kill_timeout applies to both
shellinabox and socat, update the description to reflect the fact.

Change-Id: I4595089d4dbd56dbb3364c6fb3eb1ed163652ec8
---
 ironic/conf/console.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ironic/conf/console.py b/ironic/conf/console.py
index 566f3bf1f7..bb3d67cca5 100644
--- a/ironic/conf/console.py
+++ b/ironic/conf/console.py
@@ -47,8 +47,8 @@ opts = [
                       'to start.')),
     cfg.IntOpt('kill_timeout',
                default=1,
-               help=_('Time (in seconds) to wait for the shellinabox console '
-                      'subprocess to exit before sending SIGKILL signal.')),
+               help=_('Time (in seconds) to wait for the console subprocess '
+                      'to exit before sending SIGKILL signal.')),
     cfg.IPOpt('socat_address',
               default='$my_ip',
               help=_('IP address of Socat service running on the host of '