From c6a9be4b7444e5d3844cb581c8b2634d6631874a Mon Sep 17 00:00:00 2001 From: Elena Ezhova Date: Fri, 3 Jun 2016 15:28:34 +0300 Subject: [PATCH] Fix vrrp_success_count help string Change-Id: I56335b03eddc8c6559e3e279d8ef62922d4eeecf --- doc/source/config-reference/octavia-config-table.rst | 4 ++-- octavia/common/config.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/source/config-reference/octavia-config-table.rst b/doc/source/config-reference/octavia-config-table.rst index d7f1ab87a2..861a53d6f9 100644 --- a/doc/source/config-reference/octavia-config-table.rst +++ b/doc/source/config-reference/octavia-config-table.rst @@ -237,13 +237,13 @@ Use the following options in the /etc/octavia/octavia.conf file. * - ``vrrp_check_interval`` = ``5`` - (IntOpt) VRRP health check script run interval in seconds. * - ``vrrp_fail_count`` = ``2`` - - (IntOpt) Number of successive failure before transition to a fail state. + - (IntOpt) Number of successive failures before transition to a fail state. * - ``vrrp_garp_refresh_count`` = ``2`` - (IntOpt) Number of gratuitous ARP announcements to make on each refresh interval. * - ``vrrp_garp_refresh_interval`` = ``5`` - (IntOpt) Time in seconds between gratuitous ARP announcements from the MASTER. * - ``vrrp_success_count`` = ``2`` - - (IntOpt) Number of successive failure before transition to a success state. + - (IntOpt) Number of consecutive successes before transition to a success state. * - **[keystone_authtoken]** - * - ``admin_password`` = ``None`` diff --git a/octavia/common/config.py b/octavia/common/config.py index 5f08315a84..d6fe884ed9 100644 --- a/octavia/common/config.py +++ b/octavia/common/config.py @@ -337,11 +337,11 @@ keepalived_vrrp_opts = [ help=_('VRRP health check script run interval in seconds.')), cfg.IntOpt('vrrp_fail_count', default=2, - help=_('Number of successive failure before transition to a ' + help=_('Number of successive failures before transition to a ' 'fail state.')), cfg.IntOpt('vrrp_success_count', default=2, - help=_('Number of successive failure before transition to a ' + help=_('Number of consecutive successes before transition to a ' 'success state.')), cfg.IntOpt('vrrp_garp_refresh_interval', default=5,