From f6a66d86d44827c7c77984d5a591f65158678b60 Mon Sep 17 00:00:00 2001 From: Brian Haley Date: Fri, 1 May 2020 12:33:34 -0400 Subject: [PATCH] Remove deprecated status_update_threads option It was marked for removal in the Stein cycle. Change-Id: Ib82014f92eecbcfd96a4219f2de307e5631486cb --- etc/octavia.conf | 4 ---- octavia/common/config.py | 24 ------------------- ...tatus_update_threads-85a8b0307a04c164.yaml | 6 +++++ 3 files changed, 6 insertions(+), 28 deletions(-) create mode 100644 releasenotes/notes/remove-status_update_threads-85a8b0307a04c164.yaml diff --git a/etc/octavia.conf b/etc/octavia.conf index 4a8942f26c..0fe3559378 100644 --- a/etc/octavia.conf +++ b/etc/octavia.conf @@ -104,10 +104,6 @@ # controller_ip_port_list example: 127.0.0.1:5555, 127.0.0.1:5555 # controller_ip_port_list = # failover_threads = 10 -# status_update_threads will default to the number of processors on the host. -# This setting is deprecated and if you specify health_update_threads and -# stats_update_threads, they override this parameter. -# status_update_threads = # health_update_threads will default to the number of processors on the host # health_update_threads = # stats_update_threads will default to the number of processors on the host diff --git a/octavia/common/config.py b/octavia/common/config.py index 3a53842e5c..38cf55d4e4 100644 --- a/octavia/common/config.py +++ b/octavia/common/config.py @@ -265,14 +265,6 @@ healthmanager_opts = [ cfg.IntOpt('failover_threads', default=10, help=_('Number of threads performing amphora failovers.')), - # TODO(tatsuma) Remove in or after "T" release - cfg.IntOpt('status_update_threads', - default=None, - help=_('Number of processes for amphora status update.'), - deprecated_for_removal=True, - deprecated_reason=_('This option is replaced as ' - 'health_update_threads and ' - 'stats_update_threads')), cfg.IntOpt('health_update_threads', default=None, help=_('Number of processes for amphora health update.')), @@ -878,7 +870,6 @@ def init(args, **kwargs): cfg.CONF(args=args, project='octavia', version='%%prog %s' % version.version_info.release_string(), **kwargs) - handle_deprecation_compatibility() validate.check_default_tls_versions_min_conflict() setup_remote_debugger() validate.check_default_ciphers_blacklist_conflict() @@ -900,21 +891,6 @@ def setup_logging(conf): LOG.debug("command line: %s", " ".join(sys.argv)) -# Use cfg.CONF.set_default to override the new configuration setting -# default value. This allows a value set, at the new location, to override -# a value set in the previous location while allowing settings that have -# not yet been moved to be utilized. -def handle_deprecation_compatibility(): - # TODO(tatsuma) Remove in or after "T" release - if cfg.CONF.health_manager.status_update_threads is not None: - cfg.CONF.set_default('health_update_threads', - cfg.CONF.health_manager.status_update_threads, - group='health_manager') - cfg.CONF.set_default('stats_update_threads', - cfg.CONF.health_manager.status_update_threads, - group='health_manager') - - def _enable_pydev(debugger_host, debugger_port): try: from pydev import pydevd # pylint: disable=import-outside-toplevel diff --git a/releasenotes/notes/remove-status_update_threads-85a8b0307a04c164.yaml b/releasenotes/notes/remove-status_update_threads-85a8b0307a04c164.yaml new file mode 100644 index 0000000000..2a68cdb2a9 --- /dev/null +++ b/releasenotes/notes/remove-status_update_threads-85a8b0307a04c164.yaml @@ -0,0 +1,6 @@ +--- +deprecations: + - | + The deprecated option ``status_update_threads`` has been removed, + ``health_update_threads`` and ``stats_update_threads`` should be used + instead.